summaryrefslogtreecommitdiff
path: root/tests/utils
diff options
context:
space:
mode:
authorCharles Chen <charlesccchen@google.com>2020-02-17 01:04:27 +0000
committerCharles Chen <charlesccchen@google.com>2020-02-24 03:46:51 +0000
commit1ac295ec0878ce435ef55ec56cb710c2f8f2ce80 (patch)
tree5f4013637da531ce727b301449fc83791762d94f /tests/utils
parentb629d69db047c40f2b110f2d73ad8ceb1b32ea68 (diff)
Revert "Revert "Always get window insets from server""
This reverts commit 288e1bd0455132643cf6e1dc482913f430e56bba. The previous implementation of computeWindowInsets is to use last view from WM#addView, which may be invalid because the last added view is removed and throws NPE when getting property from the invalid view. In this CL, we change the approach to always obtain window insets from server. fixes: 148789183 fixes: 149480577 Test: atest FrameworksCoreTests:WindowMetricsTest Test: atest WindowMetricsTests Change-Id: I6db5970d14ac9eebe0ab0df65cb1300515ad1754 (cherry picked from commit 6bb2d4f68c02121850c62a83349aa35d36497afa)
Diffstat (limited to 'tests/utils')
-rw-r--r--tests/utils/testutils/java/com/android/server/wm/test/filters/FrameworksTestsFilter.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/utils/testutils/java/com/android/server/wm/test/filters/FrameworksTestsFilter.java b/tests/utils/testutils/java/com/android/server/wm/test/filters/FrameworksTestsFilter.java
index 26916bcffcfb..aed62d046896 100644
--- a/tests/utils/testutils/java/com/android/server/wm/test/filters/FrameworksTestsFilter.java
+++ b/tests/utils/testutils/java/com/android/server/wm/test/filters/FrameworksTestsFilter.java
@@ -46,6 +46,7 @@ public final class FrameworksTestsFilter extends SelectTest {
"android.view.InsetsSourceTest",
"android.view.InsetsSourceConsumerTest",
"android.view.InsetsStateTest",
+ "android.view.WindowMetricsTest"
};
public FrameworksTestsFilter(Bundle testArgs) {