Hide message on bouncer only if face auth actually runs am: 1b45430325 am: 76119b23ae (ec35f89d) · Commits · e / os / android_frameworks_base

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

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -219,14 +219,17 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
	};		};


	private SwipeListener mSwipeListener = new SwipeListener() {		private final SwipeListener mSwipeListener = new SwipeListener() {
	@Override		@Override
	public void onSwipeUp() {		public void onSwipeUp() {
	if (!mUpdateMonitor.isFaceDetectionRunning()) {		if (!mUpdateMonitor.isFaceDetectionRunning()) {
	mUpdateMonitor.requestFaceAuth(true, FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER);		boolean didFaceAuthRun = mUpdateMonitor.requestFaceAuth(true,
			FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER);
	mKeyguardSecurityCallback.userActivity();		mKeyguardSecurityCallback.userActivity();
			if (didFaceAuthRun) {
	showMessage(null, null);		showMessage(null, null);
	}		}
			}
	if (mUpdateMonitor.isFaceEnrolled()) {		if (mUpdateMonitor.isFaceEnrolled()) {
	mUpdateMonitor.requestActiveUnlock(		mUpdateMonitor.requestActiveUnlock(
	ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.UNLOCK_INTENT,		ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.UNLOCK_INTENT,
	@@ -234,7 +237,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
	}		}
	}		}
	};		};
	private ConfigurationController.ConfigurationListener mConfigurationListener =		private final ConfigurationController.ConfigurationListener mConfigurationListener =
	new ConfigurationController.ConfigurationListener() {		new ConfigurationController.ConfigurationListener() {
	@Override		@Override
	public void onThemeChanged() {		public void onThemeChanged() {

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2351,11 +2351,13 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
	* @param userInitiatedRequest true if the user explicitly requested face auth		* @param userInitiatedRequest true if the user explicitly requested face auth
	* @param reason One of the reasons {@link FaceAuthApiRequestReason} on why this API is being		* @param reason One of the reasons {@link FaceAuthApiRequestReason} on why this API is being
	* invoked.		* invoked.
			* @return current face auth detection state, true if it is running.
	*/		*/
	public void requestFaceAuth(boolean userInitiatedRequest,		public boolean requestFaceAuth(boolean userInitiatedRequest,
	@FaceAuthApiRequestReason String reason) {		@FaceAuthApiRequestReason String reason) {
	mLogger.logFaceAuthRequested(userInitiatedRequest, reason);		mLogger.logFaceAuthRequested(userInitiatedRequest, reason);
	updateFaceListeningState(BIOMETRIC_ACTION_START, apiRequestReasonToUiEvent(reason));		updateFaceListeningState(BIOMETRIC_ACTION_START, apiRequestReasonToUiEvent(reason));
			return isFaceDetectionRunning();
	}		}

	/**		/**

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+8 −9

Original line number	Original line	Diff line number	Diff line
	@@ -3933,21 +3933,20 @@ public final class NotificationPanelViewController {
	mShadeLog.v("onMiddleClicked on Keyguard, mDozingOnDown: false");		mShadeLog.v("onMiddleClicked on Keyguard, mDozingOnDown: false");
	// Try triggering face auth, this "might" run. Check		// Try triggering face auth, this "might" run. Check
	// KeyguardUpdateMonitor#shouldListenForFace to see when face auth won't run.		// KeyguardUpdateMonitor#shouldListenForFace to see when face auth won't run.
	mUpdateMonitor.requestFaceAuth(true,		boolean didFaceAuthRun = mUpdateMonitor.requestFaceAuth(true,
	FaceAuthApiRequestReason.NOTIFICATION_PANEL_CLICKED);		FaceAuthApiRequestReason.NOTIFICATION_PANEL_CLICKED);

			if (didFaceAuthRun) {
			mUpdateMonitor.requestActiveUnlock(
			ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.UNLOCK_INTENT,
			"lockScreenEmptySpaceTap");
			} else {
	mLockscreenGestureLogger.write(MetricsEvent.ACTION_LS_HINT,		mLockscreenGestureLogger.write(MetricsEvent.ACTION_LS_HINT,
	0 /* lengthDp - N/A /, 0 / velocityDp - N/A */);		0 /* lengthDp - N/A /, 0 / velocityDp - N/A */);
	mLockscreenGestureLogger		mLockscreenGestureLogger
	.log(LockscreenUiEvent.LOCKSCREEN_LOCK_SHOW_HINT);		.log(LockscreenUiEvent.LOCKSCREEN_LOCK_SHOW_HINT);
	if (!mUpdateMonitor.isFaceDetectionRunning()) {
	startUnlockHintAnimation();		startUnlockHintAnimation();
	}		}
	if (mUpdateMonitor.isFaceEnrolled()) {
	mUpdateMonitor.requestActiveUnlock(
	ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.UNLOCK_INTENT,
	"lockScreenEmptySpaceTap");
	}
	}		}
	return true;		return true;
	case StatusBarState.SHADE_LOCKED:		case StatusBarState.SHADE_LOCKED:

packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java

+60 −0

Original line number	Original line	Diff line number	Diff line
	@@ -146,6 +146,8 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase {

	@Captor		@Captor
	private ArgumentCaptor<KeyguardUpdateMonitorCallback> mKeyguardUpdateMonitorCallback;		private ArgumentCaptor<KeyguardUpdateMonitorCallback> mKeyguardUpdateMonitorCallback;
			@Captor
			private ArgumentCaptor<KeyguardSecurityContainer.SwipeListener> mSwipeListenerArgumentCaptor;

	private Configuration mConfiguration;		private Configuration mConfiguration;

	@@ -475,6 +477,64 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase {
	verify(mKeyguardUpdateMonitor, never()).getUserHasTrust(anyInt());		verify(mKeyguardUpdateMonitor, never()).getUserHasTrust(anyInt());
	}		}

			@Test
			public void onSwipeUp_whenFaceDetectionIsNotRunning_initiatesFaceAuth() {
			KeyguardSecurityContainer.SwipeListener registeredSwipeListener =
			getRegisteredSwipeListener();
			when(mKeyguardUpdateMonitor.isFaceDetectionRunning()).thenReturn(false);
			setupGetSecurityView();

			registeredSwipeListener.onSwipeUp();

			verify(mKeyguardUpdateMonitor).requestFaceAuth(true,
			FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER);
			}

			@Test
			public void onSwipeUp_whenFaceDetectionIsRunning_doesNotInitiateFaceAuth() {
			KeyguardSecurityContainer.SwipeListener registeredSwipeListener =
			getRegisteredSwipeListener();
			when(mKeyguardUpdateMonitor.isFaceDetectionRunning()).thenReturn(true);

			registeredSwipeListener.onSwipeUp();

			verify(mKeyguardUpdateMonitor, never())
			.requestFaceAuth(true,
			FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER);
			}

			@Test
			public void onSwipeUp_whenFaceDetectionIsTriggered_hidesBouncerMessage() {
			KeyguardSecurityContainer.SwipeListener registeredSwipeListener =
			getRegisteredSwipeListener();
			when(mKeyguardUpdateMonitor.requestFaceAuth(true,
			FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER)).thenReturn(true);
			setupGetSecurityView();

			registeredSwipeListener.onSwipeUp();

			verify(mKeyguardPasswordViewControllerMock).showMessage(null, null);
			}

			@Test
			public void onSwipeUp_whenFaceDetectionIsNotTriggered_retainsBouncerMessage() {
			KeyguardSecurityContainer.SwipeListener registeredSwipeListener =
			getRegisteredSwipeListener();
			when(mKeyguardUpdateMonitor.requestFaceAuth(true,
			FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER)).thenReturn(false);
			setupGetSecurityView();

			registeredSwipeListener.onSwipeUp();

			verify(mKeyguardPasswordViewControllerMock, never()).showMessage(null, null);
			}

			private KeyguardSecurityContainer.SwipeListener getRegisteredSwipeListener() {
			mKeyguardSecurityContainerController.onViewAttached();
			verify(mView).setSwipeListener(mSwipeListenerArgumentCaptor.capture());
			return mSwipeListenerArgumentCaptor.getValue();
			}

	private void setupConditionsToEnableSideFpsHint() {		private void setupConditionsToEnableSideFpsHint() {
	attachView();		attachView();
	setSideFpsHintEnabledFromResources(true);		setSideFpsHintEnabledFromResources(true);

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+31 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,7 @@ import static android.telephony.SubscriptionManager.NAME_SOURCE_CARRIER_ID;

	import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_USER_REQUEST;		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_USER_REQUEST;
	import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT;		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT;
			import static com.android.keyguard.FaceAuthApiRequestReason.NOTIFICATION_PANEL_CLICKED;
	import static com.android.keyguard.KeyguardUpdateMonitor.DEFAULT_CANCEL_SIGNAL_TIMEOUT;		import static com.android.keyguard.KeyguardUpdateMonitor.DEFAULT_CANCEL_SIGNAL_TIMEOUT;

	import static com.google.common.truth.Truth.assertThat;		import static com.google.common.truth.Truth.assertThat;
	@@ -648,6 +649,36 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
	KeyguardUpdateMonitor.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_TIMEOUT);		KeyguardUpdateMonitor.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_TIMEOUT);
	}		}

			@Test
			public void requestFaceAuth_whenFaceAuthWasStarted_returnsTrue() throws RemoteException {
			// This satisfies all the preconditions to run face auth.
			keyguardNotGoingAway();
			currentUserIsPrimary();
			currentUserDoesNotHaveTrust();
			biometricsNotDisabledThroughDevicePolicyManager();
			biometricsEnabledForCurrentUser();
			userNotCurrentlySwitching();
			bouncerFullyVisibleAndNotGoingToSleep();
			mTestableLooper.processAllMessages();

			boolean didFaceAuthRun = mKeyguardUpdateMonitor.requestFaceAuth(true,
			NOTIFICATION_PANEL_CLICKED);

			assertThat(didFaceAuthRun).isTrue();
			}

			@Test
			public void requestFaceAuth_whenFaceAuthWasNotStarted_returnsFalse() throws RemoteException {
			// This ensures face auth won't run.
			biometricsDisabledForCurrentUser();
			mTestableLooper.processAllMessages();

			boolean didFaceAuthRun = mKeyguardUpdateMonitor.requestFaceAuth(true,
			NOTIFICATION_PANEL_CLICKED);

			assertThat(didFaceAuthRun).isFalse();
			}

	private void testStrongAuthExceptOnBouncer(int strongAuth) {		private void testStrongAuthExceptOnBouncer(int strongAuth) {
	when(mKeyguardBypassController.canBypass()).thenReturn(true);		when(mKeyguardBypassController.canBypass()).thenReturn(true);
	mKeyguardUpdateMonitor.setKeyguardBypassController(mKeyguardBypassController);		mKeyguardUpdateMonitor.setKeyguardBypassController(mKeyguardBypassController);