Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev

    void setActiveUser(int uid);

    // Gets the authenticator ID representing the current set of enrolled templates

    long getAuthenticatorId();

    long getAuthenticatorId(int callingUserId);

}

    // 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);

}

    // long getHardwareDevice(int i);

    // 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);

    // long getHardwareDevice(int i);

    // 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);

            // 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);

            }