1 files changed, 0 insertions, 34 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 8bbbddc0765..79328909505 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardLockedTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardLockedTests.java
@@ -217,40 +217,6 @@ public class KeyguardLockedTests extends KeyguardTestBase {
     }
 
     @Test
-    public void testTurnScreenOnActivity_withSecureKeyguardAndAod() {
-        final AodSession aodSession = createManagedAodSession();
-        final LockScreenSession lockScreenSession = createManagedLockScreenSession();
-        lockScreenSession.setLockCredential();
-        testTurnScreenOnActivity_withSecureKeyguard(aodSession, lockScreenSession,
-                false /* enableAod */);
-        testTurnScreenOnActivity_withSecureKeyguard(aodSession, lockScreenSession,
-                true /* enableAod */);
-    }
-
-    private void testTurnScreenOnActivity_withSecureKeyguard(AodSession aodSession,
-            LockScreenSession lockScreenSession, boolean enableAod) {
-        if (enableAod) {
-            assumeTrue(aodSession.isAodAvailable());
-        }
-        aodSession.setAodEnabled(enableAod);
-        lockScreenSession.sleepDevice();
-        mWmState.computeState();
-        assertTrue(mWmState.getKeyguardControllerState().keyguardShowing);
-
-        final CommandSession.ActivitySessionClient activityClient =
-                createManagedActivityClientSession();
-        final CommandSession.ActivitySession activity = activityClient.startActivity(
-                getLaunchActivityBuilder().setUseInstrumentation().setIntentExtra(extra -> {
-                    extra.putBoolean(Components.TurnScreenOnActivity.EXTRA_SHOW_WHEN_LOCKED, false);
-                }).setTargetActivity(TURN_SCREEN_ON_ACTIVITY));
-        mWmState.waitForKeyguardShowingAndNotOccluded();
-        mWmState.assertVisibility(TURN_SCREEN_ON_ACTIVITY, false);
-        assertTrue(mWmState.getKeyguardControllerState().keyguardShowing);
-        assertFalse(isDisplayOn(DEFAULT_DISPLAY));
-        activity.finish();
-    }
-
-    @Test
     public void testDismissKeyguardAttrActivity_method_turnScreenOn_withSecureKeyguard() {
         final LockScreenSession lockScreenSession = createManagedLockScreenSession();
         lockScreenSession.setLockCredential().sleepDevice();