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

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

Merge "Force notifying property callback if DeviceConfig is not updated" into main

parents 2860b51e 6111289b

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -157,8 +157,11 @@ public class SplashScreenExceptionListTest { 
        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_WINDOW_MANAGER,

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_WINDOW_MANAGER,

                KEY_SPLASH_SCREEN_EXCEPTION_LIST, commaSeparatedList, false);

                KEY_SPLASH_SCREEN_EXCEPTION_LIST, commaSeparatedList, false);

        try {

        try {

            assertTrue("Timed out waiting for DeviceConfig to be updated.",

            if (!latch.await(1, TimeUnit.SECONDS)) {

                    latch.await(5, TimeUnit.SECONDS));

                Log.w(getClass().getSimpleName(),

                        "Timed out waiting for DeviceConfig to be updated. Force update.");

                mList.updateDeviceConfig(commaSeparatedList);

            }

        } catch (InterruptedException e) {

        } catch (InterruptedException e) {

            Assert.fail(e.getMessage());

            Assert.fail(e.getMessage());

        }

        }

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -1062,6 +1062,8 @@ class WindowTestsBase extends SystemServiceTestsBase { 
        mWm.mAnimator.ready();

        mWm.mAnimator.ready();

        if (!mWm.mWindowPlacerLocked.isTraversalScheduled()) {

        if (!mWm.mWindowPlacerLocked.isTraversalScheduled()) {

            mRootWindowContainer.performSurfacePlacement();

            mRootWindowContainer.performSurfacePlacement();

        } else {

            waitHandlerIdle(mWm.mAnimationHandler);

        }

        }

        waitUntilWindowAnimatorIdle();

        waitUntilWindowAnimatorIdle();

    }

    }