Merge "Merge "Decrease amount of getAuthenticatorId invocations to the HAL"... (f56ac78f) · Commits · e / os / android_frameworks_base

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -713,8 +713,6 @@ public abstract class BiometricServiceBase extends SystemService
		// already generated a new authenticator id when the new biometric is enrolled.
		if (identifier instanceof Fingerprint) {
		updateActiveGroup(((Fingerprint)identifier).getGroupId(), null);
		} else {
		updateActiveGroup(mCurrentUserId, null);
		}
		}
		}

+14 −2

Original line number	Diff line number	Diff line
		@@ -707,6 +707,18 @@ public class FaceService extends BiometricServiceBase {
		final Face face = new Face(getBiometricUtils()
		.getUniqueName(getContext(), userId), faceId, deviceId);
		FaceService.super.handleEnrollResult(face, remaining);

		// Enrollment changes the authenticatorId, so update it here.
		IBiometricsFace daemon = getFaceDaemon();
		if (remaining == 0 && daemon != null) {
		try {
		mAuthenticatorIds.put(userId,
		hasEnrolledBiometrics(userId) ? daemon.getAuthenticatorId().value
		: 0L);
		} catch (RemoteException e) {
		Slog.e(TAG, "Unable to get authenticatorId", e);
		}
		}
		});
		}

		@@ -968,9 +980,9 @@ public class FaceService extends BiometricServiceBase {

		daemon.setActiveUser(userId, faceDir.getAbsolutePath());
		mCurrentUserId = userId;
		}
		mAuthenticatorIds.put(userId,
		hasEnrolledBiometrics(userId) ? daemon.getAuthenticatorId().value : 0L);
		}
		} catch (RemoteException e) {
		Slog.e(TAG, "Failed to setActiveUser():", e);
		}