diff options
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/SplashScreenExceptionListTest.java | 7 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/services/tests/wmtests/src/com/android/server/wm/SplashScreenExceptionListTest.java b/services/tests/wmtests/src/com/android/server/wm/SplashScreenExceptionListTest.java index 2d3c4bbe8bdc..2ea5dc4d7700 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SplashScreenExceptionListTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/SplashScreenExceptionListTest.java @@ -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()); } diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java index 9c421ba29796..7ae5a1156d07 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java @@ -1062,6 +1062,8 @@ class WindowTestsBase extends SystemServiceTestsBase { mWm.mAnimator.ready(); if (!mWm.mWindowPlacerLocked.isTraversalScheduled()) { mRootWindowContainer.performSurfacePlacement(); + } else { + waitHandlerIdle(mWm.mAnimationHandler); } waitUntilWindowAnimatorIdle(); } |