Merge "ActiveUnlock dismisses keyguard on trigger from assistant" into tm-qpr-dev (d41ebc8b) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1602,7 +1602,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		requestActiveUnlock(
		ActiveUnlockConfig.ActiveUnlockRequestOrigin.ASSISTANT,
		"assistant",
		false);
		/* dismissKeyguard */ true);
		}
		}

+20 −0

Original line number	Diff line number	Diff line
		@@ -2244,6 +2244,26 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
		assertThat(mKeyguardUpdateMonitor.shouldListenForFace()).isFalse();
		}

		@Test
		public void assistantVisible_requestActiveUnlock() {
		// GIVEN active unlock requests from the assistant are allowed
		when(mActiveUnlockConfig.shouldAllowActiveUnlockFromOrigin(
		ActiveUnlockConfig.ActiveUnlockRequestOrigin.ASSISTANT)).thenReturn(true);

		// GIVEN should trigger active unlock
		keyguardIsVisible();
		keyguardNotGoingAway();
		statusBarShadeIsNotLocked();
		when(mLockPatternUtils.isSecure(KeyguardUpdateMonitor.getCurrentUser())).thenReturn(true);

		// WHEN the assistant is visible
		mKeyguardUpdateMonitor.setAssistantVisible(true);

		// THEN request unlock with keyguard dismissal
		verify(mTrustManager).reportUserRequestedUnlock(eq(KeyguardUpdateMonitor.getCurrentUser()),
		eq(true));
		}

		@Test
		public void fingerprintFailure_requestActiveUnlock_dismissKeyguard()
		throws RemoteException {