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

Commit 1a1eea68 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Send callingUserId from AuthService -> BiometricServiceBase"

parents ff962aaf 5b5662d7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -57,5 +57,5 @@ interface IBiometricAuthenticator {
    void setActiveUser(int uid);

    // Gets the authenticator ID representing the current set of enrolled templates
    long getAuthenticatorId();
    long getAuthenticatorId(int callingUserId);
}
+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ interface IBiometricService {
    // Get a list of AuthenticatorIDs for authenticators which have enrolled templates and meet
    // the requirements for integrating with Keystore. The AuthenticatorID are known in Keystore
    // land as SIDs, and are used during key generation.
    long[] getAuthenticatorIds();
    long[] getAuthenticatorIds(int callingUserId);

    int getCurrentStrength(int sensorId);
}
+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ interface IFaceService {
    boolean hasEnrolledFaces(int userId, String opPackageName);

    // Gets the authenticator ID for face
    long getAuthenticatorId();
    long getAuthenticatorId(int callingUserId);

    // Reset the lockout when user authenticates with strong auth (e.g. PIN, pattern or password)
    void resetLockout(in byte [] token);
+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ interface IFingerprintService {
    boolean hasEnrolledFingerprints(int groupId, String opPackageName);

    // Gets the authenticator ID for fingerprint
    long getAuthenticatorId();
    long getAuthenticatorId(int callingUserId);

    // Reset the timeout when user authenticates with strong auth (e.g. PIN, pattern or password)
    void resetTimeout(in byte [] cryptoToken);
+2 −1
Original line number Diff line number Diff line
@@ -282,9 +282,10 @@ public class AuthService extends SystemService {
            // The permission check should be restored once Android Keystore no longer invokes this
            // method from inside app processes.

            final int callingUserId = UserHandle.getCallingUserId();
            final long identity = Binder.clearCallingIdentity();
            try {
                return mBiometricService.getAuthenticatorIds();
                return mBiometricService.getAuthenticatorIds(callingUserId);
            } finally {
                Binder.restoreCallingIdentity(identity);
            }
Loading