summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIssei Suzuki <issei@google.com>2022-06-21 12:10:09 +0000
committerIssei Suzuki <issei@google.com>2022-06-21 12:14:06 +0000
commitb4572b47400268c653cbc0f18161775b391c5b8a (patch)
tree495f93828e086c3c85260d147771537883a535e4
parent05400540d670d63b52660348dc17e2226f10195c (diff)
downloadcts-b4572b47400268c653cbc0f18161775b391c5b8a.tar.gz
Remove tests for unused APIs.
ActivityOptions#setDismissKeyguardIfInsecure is not used in T, and is replaced by different API in device branch. Test: atest KeyguardLockedTests KeyguardTransitionTests Bug: 233839989 Merged-In: I6cb6d9bd91970bb538036763a3a13480f07bcadd Change-Id: I9e15d5d73199c66ee93e092d4caabc1086f0ea95
-rw-r--r--tests/framework/base/windowmanager/src/android/server/wm/KeyguardLockedTests.java14
-rw-r--r--tests/framework/base/windowmanager/src/android/server/wm/KeyguardTransitionTests.java21
2 files changed, 0 insertions, 35 deletions
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardLockedTests.java b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardLockedTests.java
index 784003b2452..08b8204cd98 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardLockedTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardLockedTests.java
@@ -174,20 +174,6 @@ public class KeyguardLockedTests extends KeyguardTestBase {
}
@Test
- public void testDismissKeyguardIfInsecure_notAllowed() {
- final LockScreenSession lockScreenSession = createManagedLockScreenSession();
- lockScreenSession.setLockCredential().gotoKeyguard();
-
- mWmState.assertKeyguardShowingAndNotOccluded();
- launchActivityWithDismissKeyguardIfInsecure(SHOW_WHEN_LOCKED_ACTIVITY);
- mWmState.computeState(SHOW_WHEN_LOCKED_ACTIVITY);
- mWmState.assertVisibility(SHOW_WHEN_LOCKED_ACTIVITY, true);
-
- // Make sure we stay on Keyguard.
- mWmState.assertKeyguardShowingAndOccluded();
- }
-
- @Test
public void testDismissKeyguardActivity_method() {
final LockScreenSession lockScreenSession = createManagedLockScreenSession();
lockScreenSession.setLockCredential();
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTransitionTests.java b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTransitionTests.java
index bac67d28dc0..b585c048c4b 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTransitionTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTransitionTests.java
@@ -106,15 +106,6 @@ public class KeyguardTransitionTests extends ActivityManagerTestBase {
}
@Test
- public void testDismissKeyguardIfInsecure() {
- createManagedLockScreenSession().gotoKeyguard();
- launchActivityWithDismissKeyguardIfInsecure(SHOW_WHEN_LOCKED_NO_PREVIEW_ACTIVITY);
- mWmState.computeState(SHOW_WHEN_LOCKED_NO_PREVIEW_ACTIVITY);
- assertEquals("Picked wrong transition", TRANSIT_KEYGUARD_GOING_AWAY,
- mWmState.getDefaultDisplayLastTransition());
- }
-
- @Test
public void testNewActivityDuringOccluded() {
final LockScreenSession lockScreenSession = createManagedLockScreenSession();
launchActivity(SHOW_WHEN_LOCKED_NO_PREVIEW_ACTIVITY);
@@ -126,18 +117,6 @@ public class KeyguardTransitionTests extends ActivityManagerTestBase {
}
@Test
- public void testNewDismissKeyguardIfInsecureActivityDuringOccluded() {
- final LockScreenSession lockScreenSession = createManagedLockScreenSession();
- launchActivity(SHOW_WHEN_LOCKED_NO_PREVIEW_ACTIVITY);
- lockScreenSession.gotoKeyguard(SHOW_WHEN_LOCKED_NO_PREVIEW_ACTIVITY);
- launchActivityWithDismissKeyguardIfInsecure(
- SHOW_WHEN_LOCKED_WITH_DIALOG_NO_PREVIEW_ACTIVITY);
- mWmState.computeState(SHOW_WHEN_LOCKED_WITH_DIALOG_NO_PREVIEW_ACTIVITY);
- assertEquals("Picked wrong transition", TRANSIT_ACTIVITY_OPEN,
- mWmState.getDefaultDisplayLastTransition());
- }
-
- @Test
public void testOccludeManifestAttr() {
final LockScreenSession lockScreenSession = createManagedLockScreenSession();
lockScreenSession.gotoKeyguard();