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

Commit fd2e5cac authored by Vincent Wang's avatar Vincent Wang Committed by Android (Google) Code Review
Browse files

Merge "Add CTS test cases for new exposing APIs(1/2)" into main

parents a7da661d bc9646b9

core/api/test-current.txt

+17 −0
Original line number Diff line number Diff line
@@ -1547,6 +1547,10 @@ package android.hardware.biometrics { 
    method public boolean isAllowBackgroundAuthentication();

  }



  public abstract static class BiometricPrompt.AuthenticationCallback {

    method @FlaggedApi("android.hardware.biometrics.face_background_authentication") public void onAuthenticationAcquired(int);

  }



  public static class BiometricPrompt.Builder {

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.TEST_BIOMETRIC, "android.permission.USE_BIOMETRIC_INTERNAL"}) public android.hardware.biometrics.BiometricPrompt.Builder setAllowBackgroundAuthentication(boolean);

    method @FlaggedApi("android.multiuser.enable_biometrics_to_unlock_private_space") @NonNull @RequiresPermission(anyOf={android.Manifest.permission.TEST_BIOMETRIC, "android.permission.USE_BIOMETRIC_INTERNAL"}) public android.hardware.biometrics.BiometricPrompt.Builder setAllowBackgroundAuthentication(boolean, boolean);
@@ -1565,6 +1569,7 @@ package android.hardware.biometrics { 
  }



  public class SensorProperties {

    ctor @FlaggedApi("android.hardware.biometrics.face_background_authentication") public SensorProperties(int, int, @NonNull java.util.List<android.hardware.biometrics.SensorProperties.ComponentInfo>);

    method @NonNull public java.util.List<android.hardware.biometrics.SensorProperties.ComponentInfo> getComponentInfo();

    method public int getSensorId();

    method public int getSensorStrength();
@@ -1709,6 +1714,18 @@ package android.hardware.display { 


}



package android.hardware.face {



  @FlaggedApi("android.hardware.biometrics.face_background_authentication") public class FaceManager {

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

    method @FlaggedApi("android.hardware.biometrics.face_background_authentication") @NonNull public java.util.List<android.hardware.face.FaceSensorProperties> getSensorProperties();

  }



  @FlaggedApi("android.hardware.biometrics.face_background_authentication") public class FaceSensorProperties extends android.hardware.biometrics.SensorProperties {

  }



}



package android.hardware.fingerprint {



  @Deprecated public class FingerprintManager {

core/java/android/hardware/biometrics/BiometricPrompt.java

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL; 
import static android.hardware.biometrics.BiometricManager.Authenticators;

import static android.hardware.biometrics.Flags.FLAG_ADD_KEY_AGREEMENT_CRYPTO_OBJECT;

import static android.hardware.biometrics.Flags.FLAG_CUSTOM_BIOMETRIC_PROMPT;

import static android.hardware.biometrics.Flags.FLAG_FACE_BACKGROUND_AUTHENTICATION;

import static android.hardware.biometrics.Flags.FLAG_GET_OP_ID_CRYPTO_OBJECT;

import static android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE;
@@ -1127,6 +1128,8 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
         * @hide

         */

        @Override

        @TestApi

        @FlaggedApi(FLAG_FACE_BACKGROUND_AUTHENTICATION)

        public void onAuthenticationAcquired(int acquireInfo) {}



        /**

core/java/android/hardware/biometrics/SensorProperties.java

+6 −1
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package android.hardware.biometrics;



import static android.hardware.biometrics.Flags.FLAG_FACE_BACKGROUND_AUTHENTICATION;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.TestApi;
@@ -141,8 +144,10 @@ public class SensorProperties { 
    /**

     * @hide

     */

    @TestApi

    @FlaggedApi(FLAG_FACE_BACKGROUND_AUTHENTICATION)

    public SensorProperties(int sensorId, @Strength int sensorStrength,

            List<ComponentInfo> componentInfo) {

            @NonNull List<ComponentInfo> componentInfo) {

        mSensorId = sensorId;

        mSensorStrength = sensorStrength;

        mComponentInfo = componentInfo;

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

+26 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.hardware.face; 


import static android.Manifest.permission.INTERACT_ACROSS_USERS;

import static android.Manifest.permission.MANAGE_BIOMETRIC;

import static android.Manifest.permission.TEST_BIOMETRIC;

import static android.Manifest.permission.USE_BACKGROUND_FACE_AUTHENTICATION;

import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL;

import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_LOCKOUT_NONE;
@@ -29,6 +30,7 @@ import android.annotation.Nullable; 
import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.content.Context;

import android.content.pm.PackageManager;

import android.hardware.biometrics.BiometricAuthenticator;
@@ -36,6 +38,7 @@ import android.hardware.biometrics.BiometricConstants; 
import android.hardware.biometrics.BiometricFaceConstants;

import android.hardware.biometrics.BiometricPrompt;

import android.hardware.biometrics.BiometricStateListener;

import android.hardware.biometrics.BiometricTestSession;

import android.hardware.biometrics.CryptoObject;

import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;

import android.os.Binder;
@@ -69,6 +72,7 @@ import java.util.concurrent.Executor; 
 */

@FlaggedApi(FLAG_FACE_BACKGROUND_AUTHENTICATION)

@SystemApi

@TestApi

@SystemService(Context.FACE_SERVICE)

public class FaceManager implements BiometricAuthenticator, BiometricFaceConstants {
@@ -780,6 +784,8 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
     * @hide

     */

    @NonNull

    @TestApi

    @FlaggedApi(FLAG_FACE_BACKGROUND_AUTHENTICATION)

    public List<FaceSensorProperties> getSensorProperties() {

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

        final List<FaceSensorPropertiesInternal> internalProperties
@@ -1628,4 +1634,23 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
        Slog.w(TAG, "Unknown enrollment acquired message: " + acquireInfo + ", " + vendorCode);

        return null;

    }



    /**

     * Retrieves a test session for FaceManager.

     *

     * @hide

     */

    @TestApi

    @NonNull

    @RequiresPermission(TEST_BIOMETRIC)

    @FlaggedApi(FLAG_FACE_BACKGROUND_AUTHENTICATION)

    public BiometricTestSession createTestSession(int sensorId) {

        try {

            return new BiometricTestSession(mContext, sensorId,

                    (context, sensorId1, callback) -> mService

                            .createTestSession(sensorId1, callback, context.getOpPackageName()));

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }

}
 
 No newline at end of file

core/java/android/hardware/face/FaceSensorProperties.java

+6 −0
Original line number Diff line number Diff line
@@ -16,8 +16,12 @@ 


package android.hardware.face;



import static android.hardware.biometrics.Flags.FLAG_FACE_BACKGROUND_AUTHENTICATION;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.TestApi;

import android.hardware.biometrics.ComponentInfoInternal;

import android.hardware.biometrics.SensorProperties;
@@ -30,6 +34,8 @@ import java.util.List; 
 * Container for face sensor properties.

 * @hide

 */

@TestApi

@FlaggedApi(FLAG_FACE_BACKGROUND_AUTHENTICATION)

public class FaceSensorProperties extends SensorProperties {

    /**

     * @hide