Merge "Track whether SysUI is running fpDetect vs fpAuthenticate" into main (6c05b3a4) · Commits · e / os / android_frameworks_base

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

+35 −6

Original line number	Diff line number	Diff line
		@@ -383,6 +383,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		private List<SubscriptionInfo> mSubscriptionInfo;
		@VisibleForTesting
		protected int mFingerprintRunningState = BIOMETRIC_STATE_STOPPED;
		private boolean mFingerprintDetectRunning;
		private boolean mIsDreaming;
		private boolean mLogoutEnabled;
		private int mActiveMobileDataSubscription = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		@@ -1004,6 +1005,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		final boolean wasCancellingRestarting = mFingerprintRunningState
		== BIOMETRIC_STATE_CANCELLING_RESTARTING;
		mFingerprintRunningState = BIOMETRIC_STATE_STOPPED;
		mFingerprintDetectRunning = false;
		if (wasCancellingRestarting) {
		KeyguardUpdateMonitor.this.updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);
		} else {
		@@ -1112,6 +1114,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		boolean wasRunning = mFingerprintRunningState == BIOMETRIC_STATE_RUNNING;
		boolean isRunning = fingerprintRunningState == BIOMETRIC_STATE_RUNNING;
		mFingerprintRunningState = fingerprintRunningState;
		if (mFingerprintRunningState == BIOMETRIC_STATE_STOPPED) {
		mFingerprintDetectRunning = false;
		}
		mLogger.logFingerprintRunningState(mFingerprintRunningState);
		// Clients of KeyguardUpdateMonitor don't care about the internal state about the
		// asynchronousness of the cancel cycle. So only notify them if the actually running state
		@@ -1844,8 +1849,16 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		@Override
		public void onFingerprintDetected(int sensorId, int userId,
		boolean isStrongBiometric) {
		handleBiometricDetected(userId, FINGERPRINT, isStrongBiometric);
		// Fingerprint lifecycle ends
		if (mHandler.hasCallbacks(mFpCancelNotReceived)) {
		mLogger.d("onFingerprintDetected()"
		+ " triggered while waiting for cancellation, removing watchdog");
		mHandler.removeCallbacks(mFpCancelNotReceived);
		}
		// Don't send cancel if detect succeeds
		mFingerprintCancelSignal = null;
		setFingerprintRunningState(BIOMETRIC_STATE_STOPPED);
		handleBiometricDetected(userId, FINGERPRINT, isStrongBiometric);
		}
		};

		@@ -2108,6 +2121,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		@VisibleForTesting
		void resetBiometricListeningState() {
		mFingerprintRunningState = BIOMETRIC_STATE_STOPPED;
		mFingerprintDetectRunning = false;
		}

		@VisibleForTesting
		@@ -2546,8 +2560,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		return;
		}
		final boolean shouldListenForFingerprint = shouldListenForFingerprint(isUdfpsSupported());
		final boolean runningOrRestarting = mFingerprintRunningState == BIOMETRIC_STATE_RUNNING
		final boolean running = mFingerprintRunningState == BIOMETRIC_STATE_RUNNING;
		final boolean runningOrRestarting = running
		\|\| mFingerprintRunningState == BIOMETRIC_STATE_CANCELLING_RESTARTING;
		final boolean runDetect = !isUnlockingWithFingerprintAllowed();

		if (runningOrRestarting && !shouldListenForFingerprint) {
		if (action == BIOMETRIC_ACTION_START) {
		mLogger.v("Ignoring stopListeningForFingerprint()");
		@@ -2559,7 +2576,18 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		mLogger.v("Ignoring startListeningForFingerprint()");
		return;
		}
		startListeningForFingerprint();
		startListeningForFingerprint(runDetect);
		} else if (running && (runDetect != mFingerprintDetectRunning)) {
		if (action == BIOMETRIC_ACTION_STOP) {
		if (runDetect) {
		mLogger.v("Allowing startListeningForFingerprint(detect) despite"
		+ " BIOMETRIC_ACTION_STOP since auth was running before.");
		} else {
		mLogger.v("Ignoring startListeningForFingerprint() switch detect -> auth");
		return;
		}
		}
		startListeningForFingerprint(runDetect);
		}
		}

		@@ -2818,7 +2846,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		&& biometricEnabledForUser
		&& !isUserInLockdown(user);
		final boolean strongerAuthRequired = !isUnlockingWithFingerprintAllowed();
		final boolean isSideFps = isSfpsSupported() && isSfpsEnrolled();
		final boolean shouldListenBouncerState =
		!strongerAuthRequired \|\| !mPrimaryBouncerIsOrWillBeShowing;

		@@ -2881,7 +2908,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		}
		}

		private void startListeningForFingerprint() {
		private void startListeningForFingerprint(boolean runDetect) {
		final int userId = mSelectedUserInteractor.getSelectedUserId();
		final boolean unlockPossible = isUnlockWithFingerprintPossible(userId);
		if (mFingerprintCancelSignal != null) {
		@@ -2911,18 +2938,20 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		mFingerprintInteractiveToAuthProvider.getVendorExtension(userId));
		}

		if (!isUnlockingWithFingerprintAllowed()) {
		if (runDetect) {
		mLogger.v("startListeningForFingerprint - detect");
		mFpm.detectFingerprint(
		mFingerprintCancelSignal,
		mFingerprintDetectionCallback,
		fingerprintAuthenticateOptions);
		mFingerprintDetectRunning = true;
		} else {
		mLogger.v("startListeningForFingerprint");
		mFpm.authenticate(null /* crypto */, mFingerprintCancelSignal,
		mFingerprintAuthenticationCallback,
		null /* handler */,
		fingerprintAuthenticateOptions);
		mFingerprintDetectRunning = false;
		}
		setFingerprintRunningState(BIOMETRIC_STATE_RUNNING);
		}

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

+28 −1

Original line number	Diff line number	Diff line
		@@ -1500,7 +1500,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {

		verify(mHandler).postDelayed(mKeyguardUpdateMonitor.mFpCancelNotReceived,
		DEFAULT_CANCEL_SIGNAL_TIMEOUT);

		mKeyguardUpdateMonitor.onFingerprintAuthenticated(0, true);
		mTestableLooper.processAllMessages();

		@@ -2015,6 +2014,34 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
		.isEqualTo(BIOMETRIC_STATE_STOPPED);
		}

		@Test
		public void authenticateFingerprint_onFaceLockout_detectFingerprint() throws RemoteException {
		// GIVEN fingerprintAuthenticate
		mKeyguardUpdateMonitor.dispatchStartedGoingToSleep(0 /* why */);
		mTestableLooper.processAllMessages();
		verifyFingerprintAuthenticateCall();
		verifyFingerprintDetectNeverCalled();
		clearInvocations(mFingerprintManager);

		// WHEN class 3 face is locked out
		when(mFaceAuthInteractor.isFaceAuthStrong()).thenReturn(true);
		when(mFaceAuthInteractor.isFaceAuthEnabledAndEnrolled()).thenReturn(true);
		setupFingerprintAuth(/* isClass3 */ true);
		// GIVEN primary auth is not required by StrongAuthTracker
		primaryAuthNotRequiredByStrongAuthTracker();

		// WHEN face (class 3) is locked out
		faceAuthLockOut();
		mTestableLooper.processAllMessages();

		// THEN unlocking with fingerprint is not allowed
		Assert.assertFalse(mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed(
		BiometricSourceType.FINGERPRINT));

		// THEN fingerprint detect gets called
		verifyFingerprintDetectCall();
		}

		@Test
		public void testFingerprintSensorProperties() throws RemoteException {
		mFingerprintAuthenticatorsRegisteredCallback.onAllAuthenticatorsRegistered(