Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4710d64 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Do not update mocked environment by real display events" into main

parents 2156164a 79597940

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

+3 −6
Original line number Diff line number Diff line
@@ -376,6 +376,9 @@ public class SystemServicesTestRule implements TestRule { 


        mWmService.onInitReady();

        mAtmService.setWindowManager(mWmService);

        // Avoid real display events interfering with the test. Also avoid leaking registration.

        mContext.getSystemService(DisplayManager.class)

                .unregisterDisplayListener(mAtmService.mRootWindowContainer);

        mWmService.mDisplayEnabled = true;

        mWmService.mDisplayReady = true;

        mAtmService.getTransitionController().mIsWaitingForDisplayEnabled = false;
@@ -413,12 +416,6 @@ public class SystemServicesTestRule implements TestRule { 
            }

        }



        if (mAtmService != null) {

            // Unregister display listener from root to avoid issues with subsequent tests.

            mContext.getSystemService(DisplayManager.class)

                    .unregisterDisplayListener(mAtmService.mRootWindowContainer);

        }



        for (int i = mDeviceConfigListeners.size() - 1; i >= 0; i--) {

            DeviceConfig.removeOnPropertiesChangedListener(mDeviceConfigListeners.get(i));

        }