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

Commit f2da1a11 authored by Ilya Matyukhin's avatar Ilya Matyukhin
Browse files

Prepare BiometricService for migration to a module 

Created an interface, IBiometricAuthenticator, that encapsulates
fingerprint, iris, and face services. Removed direct references to these
services from BiometricService.

The interface will allow new biometric authenticators to be integrated
with BiometricService without modifying its code.

Bug: 141025588
Test: Face Unlock works E2E
Test: Works with BiometricPromptDemo
Test: atest BiometricServiceTest
Change-Id: I564ccdccbfe25b2c41f92f7e91eedde6acdeeed4
parent 459cb5cf

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

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public class BiometricManager { 
    public boolean hasEnrolledBiometrics(int userId) {

        if (mService != null) {

            try {

                return mService.hasEnrolledBiometrics(userId);

                return mService.hasEnrolledBiometrics(userId, mContext.getOpPackageName());

            } catch (RemoteException e) {

                Slog.w(TAG, "Remote exception in hasEnrolledBiometrics(): " + e);

                return false;

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

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

 * Copyright (C) 2019 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;



import android.hardware.biometrics.IBiometricServiceReceiverInternal;

import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;

import android.hardware.face.IFaceServiceReceiver;

import android.hardware.face.Face;



/**

 * This interface encapsulates fingerprint, face, iris, etc. authenticators.

 * Implementations of this interface are meant to be registered with BiometricService.

 * @hide

 */

interface IBiometricAuthenticator {



    // This method prepares the service to start authenticating, but doesn't start authentication.

    // This is protected by the MANAGE_BIOMETRIC signature permission. This method should only be

    // called from BiometricService. The additional uid, pid, userId arguments should be determined

    // by BiometricService. To start authentication after the clients are ready, use

    // startPreparedClient().

    void prepareForAuthentication(boolean requireConfirmation, IBinder token, long sessionId,

            int userId, IBiometricServiceReceiverInternal wrapperReceiver, String opPackageName,

            int cookie, int callingUid, int callingPid, int callingUserId);



    // Starts authentication with the previously prepared client.

    void startPreparedClient(int cookie);



    // Same as above, with extra arguments.

    void cancelAuthenticationFromService(IBinder token, String opPackageName,

            int callingUid, int callingPid, int callingUserId, boolean fromClient);



    // Determine if HAL is loaded and ready

    boolean isHardwareDetected(String opPackageName);



    // Determine if a user has at least one enrolled face

    boolean hasEnrolledTemplates(int userId, String opPackageName);



    // Reset the lockout when user authenticates with strong auth (e.g. PIN, pattern or password)

    void resetLockout(in byte [] token);



    // Explicitly set the active user (for enrolling work profile)

    void setActiveUser(int uid);

}

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

+7 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.hardware.biometrics; 
import android.os.Bundle;

import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback;

import android.hardware.biometrics.IBiometricServiceReceiver;

import android.hardware.biometrics.IBiometricAuthenticator;



/**

 * Communication channel from BiometricPrompt and BiometricManager to BiometricService. The
@@ -40,7 +41,12 @@ interface IBiometricService { 
    int canAuthenticate(String opPackageName, int userId);



    // Checks if any biometrics are enrolled.

    boolean hasEnrolledBiometrics(int userId);

    boolean hasEnrolledBiometrics(int userId, String opPackageName);



    // Registers an authenticator (e.g. face, fingerprint, iris).

    // Id must be unique, whereas strength and modality don't need to be.

    // TODO(b/123321528): Turn strength and modality into enums.

    void registerAuthenticator(int id, int strength, int modality, IBiometricAuthenticator authenticator);



    // Register callback for when keyguard biometric eligibility changes.

    void registerEnabledOnKeyguardCallback(IBiometricEnabledOnKeyguardCallback callback);

core/java/android/hardware/face/FaceManager.java

+1 −2
Original line number Diff line number Diff line
@@ -504,8 +504,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
    public boolean isHardwareDetected() {

        if (mService != null) {

            try {

                long deviceId = 0; /* TODO: plumb hardware id to FPMS */

                return mService.isHardwareDetected(deviceId, mContext.getOpPackageName());

                return mService.isHardwareDetected(mContext.getOpPackageName());

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

core/java/android/hardware/face/IFaceService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ interface IFaceService { 
    List<Face> getEnrolledFaces(int userId, String opPackageName);



    // Determine if HAL is loaded and ready

    boolean isHardwareDetected(long deviceId, String opPackageName);

    boolean isHardwareDetected(String opPackageName);



    // Get a pre-enrollment authentication token

    long generateChallenge(IBinder token);