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

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

Revert "Add CTS test cases for new exposing APIs(1/2)" 

Revert submission 26014015-Add CTS test cases for new exposing APIs

Reason for revert: The original feature was abandon

Reverted changes: /q/submissionid:26014015-Add+CTS+test+cases+for+new+exposing+APIs

Change-Id: Id25a861d71bca810518a529fc065a39e328be70c
parent bc9646b9

core/api/test-current.txt

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

    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 {

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

    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);
@@ -1571,7 +1567,6 @@ package android.hardware.biometrics { 
  }

  }





  public class SensorProperties {

  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 @NonNull public java.util.List<android.hardware.biometrics.SensorProperties.ComponentInfo> getComponentInfo();

    method public int getSensorId();

    method public int getSensorId();

    method public int getSensorStrength();

    method public int getSensorStrength();
@@ -1716,18 +1711,6 @@ 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 {

package android.hardware.fingerprint {





  @Deprecated public class FingerprintManager {

  @Deprecated public class FingerprintManager {

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

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

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_ADD_KEY_AGREEMENT_CRYPTO_OBJECT;

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

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.hardware.biometrics.Flags.FLAG_GET_OP_ID_CRYPTO_OBJECT;

import static android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE;

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

         * @hide

         */

         */

        @Override

        @Override

        @TestApi

        @FlaggedApi(FLAG_FACE_BACKGROUND_AUTHENTICATION)

        public void onAuthenticationAcquired(int acquireInfo) {}

        public void onAuthenticationAcquired(int acquireInfo) {}





        /**

        /**

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

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




package android.hardware.biometrics;

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.IntDef;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.TestApi;

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

    /**

     * @hide

     * @hide

     */

     */

    @TestApi

    @FlaggedApi(FLAG_FACE_BACKGROUND_AUTHENTICATION)

    public SensorProperties(int sensorId, @Strength int sensorStrength,

    public SensorProperties(int sensorId, @Strength int sensorStrength,

            @NonNull List<ComponentInfo> componentInfo) {

            List<ComponentInfo> componentInfo) {

        mSensorId = sensorId;

        mSensorId = sensorId;

        mSensorStrength = sensorStrength;

        mSensorStrength = sensorStrength;

        mComponentInfo = componentInfo;

        mComponentInfo = componentInfo;

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

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




import static android.Manifest.permission.INTERACT_ACROSS_USERS;

import static android.Manifest.permission.INTERACT_ACROSS_USERS;

import static android.Manifest.permission.MANAGE_BIOMETRIC;

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_BACKGROUND_FACE_AUTHENTICATION;

import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL;

import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL;

import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_LOCKOUT_NONE;

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

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.content.Context;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.hardware.biometrics.BiometricAuthenticator;

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

import android.hardware.biometrics.BiometricFaceConstants;

import android.hardware.biometrics.BiometricPrompt;

import android.hardware.biometrics.BiometricPrompt;

import android.hardware.biometrics.BiometricStateListener;

import android.hardware.biometrics.BiometricStateListener;

import android.hardware.biometrics.BiometricTestSession;

import android.hardware.biometrics.CryptoObject;

import android.hardware.biometrics.CryptoObject;

import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;

import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;

import android.os.Binder;

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

 */

@FlaggedApi(FLAG_FACE_BACKGROUND_AUTHENTICATION)

@FlaggedApi(FLAG_FACE_BACKGROUND_AUTHENTICATION)

@SystemApi

@SystemApi

@TestApi

@SystemService(Context.FACE_SERVICE)

@SystemService(Context.FACE_SERVICE)

public class FaceManager implements BiometricAuthenticator, BiometricFaceConstants {

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

     * @hide

     */

     */

    @NonNull

    @NonNull

    @TestApi

    @FlaggedApi(FLAG_FACE_BACKGROUND_AUTHENTICATION)

    public List<FaceSensorProperties> getSensorProperties() {

    public List<FaceSensorProperties> getSensorProperties() {

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

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

        final List<FaceSensorPropertiesInternal> internalProperties

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

        Slog.w(TAG, "Unknown enrollment acquired message: " + acquireInfo + ", " + vendorCode);

        return null;

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

        }

    }

}
 
}

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

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




package android.hardware.face;

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.IntDef;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.TestApi;

import android.hardware.biometrics.ComponentInfoInternal;

import android.hardware.biometrics.ComponentInfoInternal;

import android.hardware.biometrics.SensorProperties;

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

 * Container for face sensor properties.

 * @hide

 * @hide

 */

 */

@TestApi

@FlaggedApi(FLAG_FACE_BACKGROUND_AUTHENTICATION)

public class FaceSensorProperties extends SensorProperties {

public class FaceSensorProperties extends SensorProperties {

    /**

    /**

     * @hide

     * @hide