| commit | 063fb3dd93ab08a7b5cda709ef87ccd5b2ab378b | [log] [tgz] |
|---|---|---|
| author | Yahan Zhou <yahan@google.com> | Tue Feb 20 17:36:28 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 20 17:36:28 2018 +0000 |
| tree | 7f55671a70a0f7b3b34a151bf44b0252d397b6b5 | |
| parent | 725779d3ae668553d86ca06ad600719df06593f2 [diff] | |
| parent | 37cc5edfb40125028b84ad09561fde1721fb7e53 [diff] |
Merge "Wait for valid state in testShowWhenLockedActivityAndPipActivity" into oreo-mr1-cts-dev am: 37cc5edfb4 Change-Id: I589c525fe3dfcec982266bf476f3634f88bfc295
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardLockedTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardLockedTests.java index a441e56..b3d7add 100644 --- a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardLockedTests.java +++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardLockedTests.java
@@ -177,6 +177,7 @@ mAmWmState.assertVisibility(SHOW_WHEN_LOCKED_ACTIVITY, true); gotoKeyguard(); + mAmWmState.computeState(mDevice, null); mAmWmState.waitForKeyguardShowingAndOccluded(mDevice); assertShowingAndOccluded(); mAmWmState.assertVisibility(SHOW_WHEN_LOCKED_ACTIVITY, true);