Merge "Remove dismiss check from security container" into udc-dev (27dcd8bb) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -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;

+0 −15

Original line number	Diff line number	Diff line
		@@ -584,21 +584,6 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase {
		assertThat(mKeyguardSecurityContainerController.willRunDismissFromKeyguard()).isFalse();
		}

		@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();