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

Commit 6111289b authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Force notifying property callback if DeviceConfig is not updated 

It could be race that DeviceConfig still uses old values. However
it is not the purpose of the test to verify. So simply assume that
the property callback is called with the given values to continue
the test.

Also deflake another test that needs to wait for
performSurfacePlacement by the way.

Bug: 320310186
Bug: 319936577
Test: SplashScreenExceptionListTest#packageFromDeviceConfigIgnored
Change-Id: Ia4c5cd743b1ad3161ab2bb88ab45cc11e1ea391a
parent 02b61abc

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

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

                KEY_SPLASH_SCREEN_EXCEPTION_LIST, commaSeparatedList, false);

        try {

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

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

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

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

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

                mList.updateDeviceConfig(commaSeparatedList);

            }

        } catch (InterruptedException e) {

            Assert.fail(e.getMessage());

        }

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

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

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

            mRootWindowContainer.performSurfacePlacement();

        } else {

            waitHandlerIdle(mWm.mAnimationHandler);

        }

        waitUntilWindowAnimatorIdle();

    }