diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-07-12 02:11:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-07-12 02:11:28 +0000 |
| commit | 223a35e10855753db10c195ca514b61df5cdec77 (patch) | |
| tree | 95afce15b715af2e165179be77147721cc455684 | |
| parent | 920c59ca5aeec39531de35523bb0b64ebab218be (diff) | |
| parent | c5c3e18e1a8957d1826eedfcb83495a2f854149c (diff) | |
| download | cts-223a35e10855753db10c195ca514b61df5cdec77.tar.gz | |
Merge "Fix testFinishMultipleShowWhenLockedActivities fail at some devices." into android11-tests-dev
| -rwxr-xr-x | tests/framework/base/windowmanager/src/android/server/wm/KeyguardTests.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTests.java b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTests.java index 2e2e7dea786..4857ebd95c5 100755 --- a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTests.java +++ b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTests.java @@ -184,17 +184,21 @@ public class KeyguardTests extends KeyguardTestBase { .setTargetActivity(SHOW_WHEN_LOCKED_ATTR_ROTATION_ACTIVITY)); mWmState.computeState(SHOW_WHEN_LOCKED_ACTIVITY, SHOW_WHEN_LOCKED_ATTR_ROTATION_ACTIVITY); - mWmState.assertVisibility(SHOW_WHEN_LOCKED_ACTIVITY, false); mWmState.assertVisibility(SHOW_WHEN_LOCKED_ATTR_ROTATION_ACTIVITY, true); + mWmState.assertFocusedActivity("Launching Activity must be focused", + SHOW_WHEN_LOCKED_ATTR_ROTATION_ACTIVITY); lockScreenSession.gotoKeyguard(SHOW_WHEN_LOCKED_ATTR_ROTATION_ACTIVITY); - mWmState.assertVisibility(SHOW_WHEN_LOCKED_ACTIVITY, false); mWmState.assertVisibility(SHOW_WHEN_LOCKED_ATTR_ROTATION_ACTIVITY, true); + mWmState.assertFocusedActivity("Top activity stay un-change", + SHOW_WHEN_LOCKED_ATTR_ROTATION_ACTIVITY); mWmState.assertKeyguardShowingAndOccluded(); showWhenLockedActivitySession.finish(); mWmState.computeState(SHOW_WHEN_LOCKED_ACTIVITY); mWmState.assertVisibility(SHOW_WHEN_LOCKED_ACTIVITY, true); + mWmState.assertFocusedActivity("ShowWhenLocked activity must occludes keyguard", + SHOW_WHEN_LOCKED_ACTIVITY); mWmState.assertKeyguardShowingAndOccluded(); } |