Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Decrease amount of getAuthenticatorId invocations to the HAL" into qt-r1-dev am: 2b418fc384" into qt-r1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-06-12 22:28:35 +00:00
committed by Android (Google) Code Review
parent 99365fdf0a 05677785d4
commit f56ac78f5a
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/biometrics/BiometricServiceBase.java
View File

@@ -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);
}
}
}

16
services/core/java/com/android/server/biometrics/face/FaceService.java
View File

@@ -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);
}
mAuthenticatorIds.put(userId,
hasEnrolledBiometrics(userId) ? daemon.getAuthenticatorId().value : 0L);
} catch (RemoteException e) {
Slog.e(TAG, "Failed to setActiveUser():", e);
}