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

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

Merge changes from topic "biometricservice-cts" 

* changes:
  Initial implementation of BiometricManager TestApis
  Add BiometricManager#getUiPackage TestApi
parents 15b8613a 3eb5c9c2

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -698,6 +698,7 @@ package android.hardware.biometrics { 
  public class BiometricManager {

    method @NonNull @RequiresPermission(android.Manifest.permission.TEST_BIOMETRIC) public android.hardware.biometrics.BiometricTestSession createTestSession(int);

    method @NonNull @RequiresPermission(android.Manifest.permission.TEST_BIOMETRIC) public java.util.List<android.hardware.biometrics.SensorProperties> getSensorProperties();

    method @NonNull @RequiresPermission(android.Manifest.permission.TEST_BIOMETRIC) public String getUiPackage();

  }



  public class BiometricTestSession implements java.lang.AutoCloseable {

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

+32 −2
Original line number Diff line number Diff line
@@ -208,7 +208,17 @@ public class BiometricManager { 
    @NonNull

    @RequiresPermission(TEST_BIOMETRIC)

    public List<SensorProperties> getSensorProperties() {

        return new ArrayList<>(); // TODO(169459906)

        try {

            final List<SensorPropertiesInternal> internalProperties =

                    mService.getSensorProperties(mContext.getOpPackageName());

            final List<SensorProperties> properties = new ArrayList<>();

            for (SensorPropertiesInternal internalProp : internalProperties) {

                properties.add(SensorProperties.from(internalProp));

            }

            return properties;

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**
@@ -219,7 +229,27 @@ public class BiometricManager { 
    @NonNull

    @RequiresPermission(TEST_BIOMETRIC)

    public BiometricTestSession createTestSession(int sensorId) {

        return null; // TODO(169459906)

        try {

            return new BiometricTestSession(mContext,

                    mService.createTestSession(sensorId, mContext.getOpPackageName()));

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Retrieves the package where BiometricPrompt's UI is implemented.

     * @hide

     */

    @TestApi

    @NonNull

    @RequiresPermission(TEST_BIOMETRIC)

    public String getUiPackage() {

        try {

            return mService.getUiPackage();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

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

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


import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback;

import android.hardware.biometrics.IBiometricServiceReceiver;

import android.hardware.biometrics.ITestSession;

import android.hardware.biometrics.PromptInfo;

import android.hardware.biometrics.SensorPropertiesInternal;



/**

 * Communication channel from BiometricPrompt and BiometricManager to AuthService. The
@@ -28,6 +30,15 @@ import android.hardware.biometrics.PromptInfo; 
 * @hide

 */

interface IAuthService {

    // Creates a test session with the specified sensorId

    ITestSession createTestSession(int sensorId, String opPackageName);



    // Retrieve static sensor properties for all biometric sensors

    List<SensorPropertiesInternal> getSensorProperties(String opPackageName);



    // Retrieve the package where BIometricOrompt's UI is implemented

    String getUiPackage();



    // Requests authentication. The service choose the appropriate biometric to use, and show

    // the corresponding BiometricDialog.

    void authenticate(IBinder token, long sessionId, int userId,

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

+13 −3
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package android.hardware.biometrics; 


import android.hardware.biometrics.IBiometricSensorReceiver;

import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;

import android.hardware.biometrics.ITestSession;

import android.hardware.biometrics.SensorPropertiesInternal;

import android.hardware.face.IFaceServiceReceiver;

import android.hardware.face.Face;
@@ -28,6 +30,15 @@ import android.hardware.face.Face; 
 */

interface IBiometricAuthenticator {



    // Creates a test session

    ITestSession createTestSession(String opPackageName);



    // Retrieve static sensor properties

    SensorPropertiesInternal getSensorProperties(String opPackageName);



    // Requests a proto dump of the service. See biometrics.proto

    byte[] dumpSensorServiceStateProto();



    // 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
@@ -35,14 +46,13 @@ interface IBiometricAuthenticator { 
    // startPreparedClient().

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

            int userId, IBiometricSensorReceiver sensorReceiver, String opPackageName,

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

            int cookie);



    // Starts authentication with the previously prepared client.

    void startPreparedClient(int cookie);



    // Cancels authentication.

    void cancelAuthenticationFromService(IBinder token, String opPackageName,

            int callingUid, int callingPid, int callingUserId);

    void cancelAuthenticationFromService(IBinder token, String opPackageName);



    // Determine if HAL is loaded and ready

    boolean isHardwareDetected(String opPackageName);

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

+10 −4
Original line number Diff line number Diff line
@@ -19,22 +19,28 @@ package android.hardware.biometrics; 
import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback;

import android.hardware.biometrics.IBiometricServiceReceiver;

import android.hardware.biometrics.IBiometricAuthenticator;

import android.hardware.biometrics.ITestSession;

import android.hardware.biometrics.PromptInfo;

import android.hardware.biometrics.SensorPropertiesInternal;



/**

 * Communication channel from AuthService to BiometricService.

 * @hide

 */

interface IBiometricService {

    // Creates a test session with the specified sensorId

    ITestSession createTestSession(int sensorId, String opPackageName);



    // Retrieve static sensor properties for all biometric sensors

    List<SensorPropertiesInternal> getSensorProperties(String opPackageName);



    // Requests authentication. The service choose the appropriate biometric to use, and show

    // the corresponding BiometricDialog.

    void authenticate(IBinder token, long operationId, int userId,

            IBiometricServiceReceiver receiver, String opPackageName, in PromptInfo promptInfo,

            int callingUid, int callingPid, int callingUserId);

            IBiometricServiceReceiver receiver, String opPackageName, in PromptInfo promptInfo);



    // Cancel authentication for the given session.

    void cancelAuthentication(IBinder token, String opPackageName, int callingUid, int callingPid,

            int callingUserId);

    void cancelAuthentication(IBinder token, String opPackageName);



    // Checks if biometrics can be used.

    int canAuthenticate(String opPackageName, int userId, int callingUserId, int authenticators);