Merge "[DO NOT MERGE] fingerprint: handle PerformanceStats NULL pointers" (e5af1e14) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/biometrics/BiometricServiceBase.java

+12 −8

Original line number	Diff line number	Diff line
		@@ -284,11 +284,13 @@ public abstract class BiometricServiceBase extends SystemService
		@Override
		public int handleFailedAttempt() {
		final int lockoutMode = getLockoutMode();
		if (mPerformanceStats != null) {
		if (lockoutMode == AuthenticationClient.LOCKOUT_PERMANENT) {
		mPerformanceStats.permanentLockout++;
		} else if (lockoutMode == AuthenticationClient.LOCKOUT_TIMED) {
		mPerformanceStats.lockout++;
		}
		}

		// Failing multiple times will continue to push out the lockout time
		if (lockoutMode != AuthenticationClient.LOCKOUT_NONE) {
		@@ -730,12 +732,14 @@ public abstract class BiometricServiceBase extends SystemService
		if (client != null && client.onAuthenticated(identifier, authenticated, token)) {
		removeClient(client);
		}
		if (mPerformanceStats != null) {
		if (authenticated) {
		mPerformanceStats.accept++;
		} else {
		mPerformanceStats.reject++;
		}
		}
		}

		protected void handleEnrollResult(BiometricAuthenticator.Identifier identifier,
		int remaining) {