Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f95b627f authored Jan 08, 2016 by Roman Birg Committed by Scott Mertz Jan 08, 2016

Fingerprint: handle canclled error code



SAMBAR-1240
Change-Id: I26dcaf2c5ba01833103589222cb6d8ccbdd3534f
Signed-off-by: Roman Birg <roman@cyngn.com>

parent d1789a54

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -363,6 +363,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		}
		if (error) {
		onFingerprintAttemptFailed(true, fingerprintIdOrError);
		return;
		} else if (fingerprintIdOrError == 0) {
		// not a valid fingerprint
		onFingerprintAttemptFailed(false, 0);

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -582,11 +582,15 @@ public class KeyguardViewMediator extends SystemUI {
		case FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE:
		// service may not be available.
		setupFingerprint(screenOn);
		return;
		break;
		case FingerprintManager.FINGERPRINT_ERROR_CANCELED:
		Log.w(TAG, "fingerprint error: cancelled.");
		break;
		default:
		Log.e(TAG, "FingerprintManager reported unhandled error: " + errorCode);
		return;
		break;
		}
		return;
		}

		if (!screenOn) { // mScreenOn isn't as reliable