diff options
2 files changed, 0 insertions, 22 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java index b5e54209dab2..74b29a77aad4 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java @@ -264,13 +264,6 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard */ @Override public void finish(boolean fromPrimaryAuth, int targetUserId) { - if (!mKeyguardStateController.canDismissLockScreen() && !fromPrimaryAuth) { - Log.e(TAG, - "Tried to dismiss keyguard when lockscreen is not dismissible and user " - + "was not authenticated with a primary security method " - + "(pin/password/pattern)."); - return; - } // If there's a pending runnable because the user interacted with a widget // and we're leaving keyguard, then run it. boolean deferKeyguardDone = false; diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java index d2e5a45c3a93..2f20f76ccc50 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java @@ -585,21 +585,6 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { } @Test - public void testSecurityCallbackFinish() { - when(mKeyguardStateController.canDismissLockScreen()).thenReturn(true); - when(mKeyguardUpdateMonitor.isUserUnlocked(0)).thenReturn(true); - mKeyguardSecurityContainerController.finish(true, 0); - verify(mViewMediatorCallback).keyguardDone(anyBoolean(), anyInt()); - } - - @Test - public void testSecurityCallbackFinish_cannotDismissLockScreenAndNotStrongAuth() { - when(mKeyguardStateController.canDismissLockScreen()).thenReturn(false); - mKeyguardSecurityContainerController.finish(false, 0); - verify(mViewMediatorCallback, never()).keyguardDone(anyBoolean(), anyInt()); - } - - @Test public void testOnStartingToHide() { mKeyguardSecurityContainerController.onStartingToHide(); verify(mKeyguardSecurityViewFlipperController).getSecurityView(any(SecurityMode.class), |