Merge "Update bouncer fingerprint lockout logic" into rvc-dev am: f7ef70e669 (37db0a66) · Commits · e / os / android_frameworks_base

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import com.android.internal.util.LatencyTracker;
		import com.android.internal.widget.LockPatternChecker;
		import com.android.internal.widget.LockPatternUtils;
		import com.android.internal.widget.LockscreenCredential;
		import com.android.systemui.Dependency;
		import com.android.systemui.R;

		/**
		@@ -50,6 +51,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout
		private boolean mDismissing;
		protected boolean mResumed;
		private CountDownTimer mCountdownTimer = null;
		private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

		// To avoid accidental lockout due to events while the device in in the pocket, ignore
		// any passwords with length less than or equal to this length.
		@@ -61,6 +63,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout

		public KeyguardAbsKeyInputView(Context context, AttributeSet attrs) {
		super(context, attrs);
		mKeyguardUpdateMonitor = Dependency.get(KeyguardUpdateMonitor.class);
		}

		@Override
		@@ -151,6 +154,8 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout
		LatencyTracker.getInstance(mContext).onActionStart(ACTION_CHECK_CREDENTIAL);
		LatencyTracker.getInstance(mContext).onActionStart(ACTION_CHECK_CREDENTIAL_UNLOCKED);
		}

		mKeyguardUpdateMonitor.setCredentialAttempted();
		mPendingLockCheck = LockPatternChecker.checkCredential(
		mLockPatternUtils,
		password,

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -282,6 +282,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit

		@Override
		public void onPatternDetected(final List<LockPatternView.Cell> pattern) {
		mKeyguardUpdateMonitor.setCredentialAttempted();
		mLockPatternView.disableInput();
		if (mPendingLockCheck != null) {
		mPendingLockCheck.cancel(false);

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

+28 −2

Original line number	Diff line number	Diff line
		@@ -223,6 +223,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		private int mRingMode;
		private int mPhoneState;
		private boolean mKeyguardIsVisible;
		private boolean mCredentialAttempted;
		private boolean mKeyguardGoingAway;
		private boolean mGoingToSleep;
		private boolean mBouncer;
		@@ -497,12 +498,22 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		}
		}

		/**
		* Updates KeyguardUpdateMonitor's internal state to know if credential was attempted on
		* bouncer. Note that this does not care if the credential was correct/incorrect. This is
		* cleared when the user leaves the bouncer (unlocked, screen off, back to lockscreen, etc)
		*/
		public void setCredentialAttempted() {
		mCredentialAttempted = true;
		updateBiometricListeningState();
		}

		/**
		* Updates KeyguardUpdateMonitor's internal state to know if keyguard is goingAway
		*/
		public void setKeyguardGoingAway(boolean goingAway) {
		mKeyguardGoingAway = goingAway;
		updateFingerprintListeningState();
		updateBiometricListeningState();
		}

		/**
		@@ -664,6 +675,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		updateFingerprintListeningState();
		} else {
		setFingerprintRunningState(BIOMETRIC_STATE_STOPPED);
		mFingerprintCancelSignal = null;
		mFaceCancelSignal = null;
		}

		if (msgId == FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE) {
		@@ -679,6 +692,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		getCurrentUser());
		}

		if (msgId == FingerprintManager.FINGERPRINT_ERROR_LOCKOUT
		\|\| msgId == FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT) {
		mFingerprintLockedOut = true;
		}

		for (int i = 0; i < mCallbacks.size(); i++) {
		KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
		if (cb != null) {
		@@ -688,6 +706,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		}

		private void handleFingerprintLockoutReset() {
		mFingerprintLockedOut = false;
		updateFingerprintListeningState();
		}

		@@ -1274,6 +1293,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		private CancellationSignal mFaceCancelSignal;
		private FingerprintManager mFpm;
		private FaceManager mFaceManager;
		private boolean mFingerprintLockedOut;

		/**
		* When we receive a
		@@ -1820,13 +1840,17 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		}

		private boolean shouldListenForFingerprint() {
		final boolean allowedOnBouncer =
		!(mFingerprintLockedOut && mBouncer && mCredentialAttempted);

		// Only listen if this KeyguardUpdateMonitor belongs to the primary user. There is an
		// instance of KeyguardUpdateMonitor for each user but KeyguardUpdateMonitor is user-aware.
		final boolean shouldListen = (mKeyguardIsVisible \|\| !mDeviceInteractive \|\|
		(mBouncer && !mKeyguardGoingAway) \|\| mGoingToSleep \|\|
		shouldListenForFingerprintAssistant() \|\| (mKeyguardOccluded && mIsDreaming))
		&& !mSwitchingUser && !isFingerprintDisabled(getCurrentUser())
		&& (!mKeyguardGoingAway \|\| !mDeviceInteractive) && mIsPrimaryUser;
		&& (!mKeyguardGoingAway \|\| !mDeviceInteractive) && mIsPrimaryUser
		&& allowedOnBouncer;
		return shouldListen;
		}

		@@ -2372,6 +2396,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		// camera requests dismiss keyguard (tapping on photos for example). When these happen,
		// face auth should resume.
		mSecureCameraLaunched = false;
		} else {
		mCredentialAttempted = false;
		}

		for (int i = 0; i < mCallbacks.size(); i++) {