commit 27f3913c836db0a8d2ccb1de7a91336b8166c109
author Riddle Hsu <riddlehsu@google.com> Tue Aug 15 10:41:59 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 15 10:41:59 2023 +0000
tree 7bc671683da308508d6bd6448fab0293e67b2af6
parent 8d008336ea9e8b54041a4256f475b8d0bbd18c3d
parent c870133b0d50b5e0b943da25a61a85e53b291e19

Merge "Fix leakage of unit test on large screen/foldable device" into main

services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java

diff --git a/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java b/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java
index be436bf..7634d9f 100644
--- a/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java
+++ b/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java
@@ -384,7 +384,16 @@
     }
 
     private void tearDown() {
-        mWmService.mRoot.forAllDisplayPolicies(DisplayPolicy::release);
+        for (int i = mWmService.mRoot.getChildCount() - 1; i >= 0; i--) {
+            final DisplayContent dc = mWmService.mRoot.getChildAt(i);
+            // Unregister SettingsObserver.
+            dc.getDisplayPolicy().release();
+            // Unregister SensorEventListener (foldable device may register for hinge angle).
+            dc.getDisplayRotation().onDisplayRemoved();
+            if (dc.mDisplayRotationCompatPolicy != null) {
+                dc.mDisplayRotationCompatPolicy.dispose();
+            }
+        }
 
         // Unregister display listener from root to avoid issues with subsequent tests.
         mContext.getSystemService(DisplayManager.class)