Keyguard: Authenticate with fingerprint (a6fe97c6) · Commits · e / os / android_frameworks_base

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

+30 −4

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ import com.android.internal.telephony.IccCardConstants;
		import com.android.internal.telephony.IccCardConstants.State;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.TelephonyIntents;
		import com.android.internal.widget.LockPatternUtils;
		import com.google.android.collect.Lists;

		import java.lang.ref.WeakReference;
		@@ -160,6 +161,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {

		private boolean mScreenOn;

		private LockPatternUtils mLockPatternUtils;

		private final Handler mHandler = new Handler() {
		@Override
		public void handleMessage(Message msg) {
		@@ -348,7 +351,13 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		}

		private void handleFingerprintProcessed(int fingerprintId) {
		if (fingerprintId == 0) return; // not a valid fingerprint
		if (fingerprintId == 0) {
		// Not a valid fingerprint, start another authenticate call to try again
		FingerprintManager fpm =
		(FingerprintManager) mContext.getSystemService(Context.FINGERPRINT_SERVICE);
		fpm.authenticate();
		return; // not a valid fingerprint
		}

		final int userId;
		try {
		@@ -655,6 +664,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		}

		protected void handleScreenTurnedOn() {
		startFingerAuthIfUsingFingerprint();
		final int count = mCallbacks.size();
		for (int i = 0; i < count; i++) {
		KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
		@@ -665,6 +675,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		}

		protected void handleScreenTurnedOff(int arg1) {
		stopAuthenticatingFingerprint();
		clearFingerprintRecognized();
		final int count = mCallbacks.size();
		for (int i = 0; i < count; i++) {
		@@ -773,9 +784,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		TrustManager trustManager = (TrustManager) context.getSystemService(Context.TRUST_SERVICE);
		trustManager.registerTrustListener(this);

		FingerprintManager fpm;
		fpm = (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
		fpm.startListening(mFingerprintManagerReceiver);
		mLockPatternUtils = new LockPatternUtils(mContext);
		startFingerAuthIfUsingFingerprint();
		}

		private boolean isDeviceProvisionedInSettingsDb() {
		@@ -1250,6 +1260,22 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		mFailedBiometricUnlockAttempts = 0;
		}

		public void startFingerAuthIfUsingFingerprint() {
		if (mLockPatternUtils.usingFingerprint()) {
		FingerprintManager fpm =
		(FingerprintManager) mContext.getSystemService(Context.FINGERPRINT_SERVICE);
		fpm.startListening(mFingerprintManagerReceiver);
		fpm.authenticate();
		}
		}

		public void stopAuthenticatingFingerprint() {
		FingerprintManager fpm =
		(FingerprintManager) mContext.getSystemService(Context.FINGERPRINT_SERVICE);
		fpm.cancel();
		fpm.stopListening();
		}

		public void clearFingerprintRecognized() {
		mUserFingerprintRecognized.clear();
		}

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -471,11 +471,8 @@ public class KeyguardViewMediator extends SystemUI {
		}

		public void onFingerprintRecognized(int userId) {
		if (mStatusBarKeyguardViewManager.isBouncerShowing()) {
		mViewMediatorCallback.keyguardDone(true);
		}
		};

		};

		ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
		@@ -1328,6 +1325,7 @@ public class KeyguardViewMediator extends SystemUI {
		mUpdateMonitor.clearFailedUnlockAttempts();
		}
		mUpdateMonitor.clearFingerprintRecognized();
		mUpdateMonitor.stopAuthenticatingFingerprint();

		if (mExitSecureCallback != null) {
		try {