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

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

Merge "3/n: Add most remaining plumbing for authenticatorId invalidation"

parents 119e2ff2 775a9a37

core/java/android/hardware/biometrics/BiometricManager.java

+21 −0
Original line number Diff line number Diff line
@@ -357,6 +357,27 @@ public class BiometricManager { 
        }

    }



    /**

     * Requests all {@link Authenticators.Types#BIOMETRIC_STRONG} sensors to have their

     * authenticatorId invalidated for the specified user. This happens when enrollments have been

     * added on devices with multiple biometric sensors.

     *

     * @param userId userId that the authenticatorId should be invalidated for

     * @param fromSensorId sensor that triggered the invalidation request

     * @hide

     */

    @RequiresPermission(USE_BIOMETRIC_INTERNAL)

    public void invalidateAuthenticatorIds(int userId, int fromSensorId,

            @NonNull IInvalidationCallback callback) {

        if (mService != null) {

            try {

                mService.invalidateAuthenticatorIds(userId, fromSensorId, callback);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

        }

    }



    /**

     * Get a list of AuthenticatorIDs for biometric authenticators which have 1) enrolled templates,

     * and 2) meet the requirements for integrating with Keystore. The AuthenticatorIDs are known

core/java/android/hardware/biometrics/IAuthService.aidl

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.hardware.biometrics; 


import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback;

import android.hardware.biometrics.IBiometricServiceReceiver;

import android.hardware.biometrics.IInvalidationCallback;

import android.hardware.biometrics.ITestSession;

import android.hardware.biometrics.PromptInfo;

import android.hardware.biometrics.SensorPropertiesInternal;
@@ -57,6 +58,11 @@ interface IAuthService { 
    // Register callback for when keyguard biometric eligibility changes.

    void registerEnabledOnKeyguardCallback(IBiometricEnabledOnKeyguardCallback callback);



    // Requests all BIOMETRIC_STRONG sensors to have their authenticatorId invalidated for the

    // specified user. This happens when enrollments have been added on devices with multiple

    // biometric sensors.

    void invalidateAuthenticatorIds(int userId, int fromSensorId, IInvalidationCallback callback);



    // 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.

core/java/android/hardware/biometrics/IBiometricAuthenticator.aidl

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.hardware.biometrics; 


import android.hardware.biometrics.IBiometricSensorReceiver;

import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;

import android.hardware.biometrics.IInvalidationCallback;

import android.hardware.biometrics.ITestSession;

import android.hardware.biometrics.SensorPropertiesInternal;

import android.hardware.face.IFaceServiceReceiver;
@@ -63,6 +64,9 @@ interface IBiometricAuthenticator { 
    // Return the LockoutTracker status for the specified user

    int getLockoutModeForUser(int userId);



    // Request the authenticatorId to be invalidated for the specified user

    void invalidateAuthenticatorId(int userId, IInvalidationCallback callback);



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

    long getAuthenticatorId(int callingUserId);

}

core/java/android/hardware/biometrics/IBiometricService.aidl

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.hardware.biometrics; 
import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback;

import android.hardware.biometrics.IBiometricServiceReceiver;

import android.hardware.biometrics.IBiometricAuthenticator;

import android.hardware.biometrics.IInvalidationCallback;

import android.hardware.biometrics.ITestSession;

import android.hardware.biometrics.PromptInfo;

import android.hardware.biometrics.SensorPropertiesInternal;
@@ -62,6 +63,11 @@ interface IBiometricService { 
    // Client lifecycle is still managed in <Biometric>Service.

    void onReadyForAuthentication(int cookie);



    // Requests all BIOMETRIC_STRONG sensors to have their authenticatorId invalidated for the

    // specified user. This happens when enrollments have been added on devices with multiple

    // biometric sensors.

    void invalidateAuthenticatorIds(int userId, int fromSensorId, IInvalidationCallback callback);



    // 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.

core/java/android/hardware/biometrics/IInvalidationCallback.aidl

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.biometrics;



/**

 * Notifies the caller for BiometricManager#invalidateAuthenticatorIds status updates. See

 * InvalidationRequesterClient for more info.

 * @hide

 */

interface IInvalidationCallback {

    // Notifies the caller when all authenticatorId(s) have been invalidated.

    void onCompleted();

}
 
 No newline at end of file