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

Commit b39273ed authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Propogate face/fingerprint authenticate options to detect and... 

Merge "Propogate face/fingerprint authenticate options to detect and authenticate clients." into udc-dev am: deb6c5c0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21550455



Change-Id: I10558ebaf6ae22fb09af0939865a416519c620e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d2d7d17 deb6c5c0

core/java/android/hardware/face/FaceAuthenticateOptions.java

+12 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class FaceAuthenticateOptions implements AuthenticateOptions, Parcelable 
    }



    /** The sensor id for this operation. */

    private final int mSensorId;

    private int mSensorId;

    private static int defaultSensorId() {

        return -1;

    }
@@ -298,6 +298,15 @@ public class FaceAuthenticateOptions implements AuthenticateOptions, Parcelable 
        return mAttributionTag;

    }



    /**

     * The sensor id for this operation.

     */

    @DataClass.Generated.Member

    public @NonNull FaceAuthenticateOptions setSensorId( int value) {

        mSensorId = value;

        return this;

    }



    /**

     * The package name for that operation that should be used for

     * {@link android.app.AppOpsManager} verification.
@@ -610,10 +619,10 @@ public class FaceAuthenticateOptions implements AuthenticateOptions, Parcelable 
    }



    @DataClass.Generated(

            time = 1676508211385L,

            time = 1677119626034L,

            codegenVersion = "1.0.23",

            sourceFile = "frameworks/base/core/java/android/hardware/face/FaceAuthenticateOptions.java",

            inputSignatures = "private final  int mUserId\nprivate final  int mSensorId\nprivate final @android.hardware.biometrics.AuthenticateOptions.DisplayState int mDisplayState\npublic static final  int AUTHENTICATE_REASON_UNKNOWN\npublic static final  int AUTHENTICATE_REASON_STARTED_WAKING_UP\npublic static final  int AUTHENTICATE_REASON_PRIMARY_BOUNCER_SHOWN\npublic static final  int AUTHENTICATE_REASON_ASSISTANT_VISIBLE\npublic static final  int AUTHENTICATE_REASON_ALTERNATE_BIOMETRIC_BOUNCER_SHOWN\npublic static final  int AUTHENTICATE_REASON_NOTIFICATION_PANEL_CLICKED\npublic static final  int AUTHENTICATE_REASON_OCCLUDING_APP_REQUESTED\npublic static final  int AUTHENTICATE_REASON_PICK_UP_GESTURE_TRIGGERED\npublic static final  int AUTHENTICATE_REASON_QS_EXPANDED\npublic static final  int AUTHENTICATE_REASON_SWIPE_UP_ON_BOUNCER\npublic static final  int AUTHENTICATE_REASON_UDFPS_POINTER_DOWN\nprivate final @android.hardware.face.FaceAuthenticateOptions.AuthenticateReason int mAuthenticateReason\nprivate final @android.os.PowerManager.WakeReason int mWakeReason\nprivate @android.annotation.NonNull java.lang.String mOpPackageName\nprivate @android.annotation.Nullable java.lang.String mAttributionTag\nprivate static  int defaultUserId()\nprivate static  int defaultSensorId()\nprivate static  int defaultDisplayState()\nprivate static  int defaultAuthenticateReason()\nprivate static  int defaultWakeReason()\nprivate static  java.lang.String defaultOpPackageName()\nprivate static  java.lang.String defaultAttributionTag()\nclass FaceAuthenticateOptions extends java.lang.Object implements [android.hardware.biometrics.AuthenticateOptions, android.os.Parcelable]\n@com.android.internal.util.DataClass(genParcelable=true, genAidl=true, genBuilder=true, genSetters=true, genEqualsHashCode=true)")

            inputSignatures = "private final  int mUserId\nprivate  int mSensorId\nprivate final @android.hardware.biometrics.AuthenticateOptions.DisplayState int mDisplayState\npublic static final  int AUTHENTICATE_REASON_UNKNOWN\npublic static final  int AUTHENTICATE_REASON_STARTED_WAKING_UP\npublic static final  int AUTHENTICATE_REASON_PRIMARY_BOUNCER_SHOWN\npublic static final  int AUTHENTICATE_REASON_ASSISTANT_VISIBLE\npublic static final  int AUTHENTICATE_REASON_ALTERNATE_BIOMETRIC_BOUNCER_SHOWN\npublic static final  int AUTHENTICATE_REASON_NOTIFICATION_PANEL_CLICKED\npublic static final  int AUTHENTICATE_REASON_OCCLUDING_APP_REQUESTED\npublic static final  int AUTHENTICATE_REASON_PICK_UP_GESTURE_TRIGGERED\npublic static final  int AUTHENTICATE_REASON_QS_EXPANDED\npublic static final  int AUTHENTICATE_REASON_SWIPE_UP_ON_BOUNCER\npublic static final  int AUTHENTICATE_REASON_UDFPS_POINTER_DOWN\nprivate final @android.hardware.face.FaceAuthenticateOptions.AuthenticateReason int mAuthenticateReason\nprivate final @android.os.PowerManager.WakeReason int mWakeReason\nprivate @android.annotation.NonNull java.lang.String mOpPackageName\nprivate @android.annotation.Nullable java.lang.String mAttributionTag\nprivate static  int defaultUserId()\nprivate static  int defaultSensorId()\nprivate static  int defaultDisplayState()\nprivate static  int defaultAuthenticateReason()\nprivate static  int defaultWakeReason()\nprivate static  java.lang.String defaultOpPackageName()\nprivate static  java.lang.String defaultAttributionTag()\nclass FaceAuthenticateOptions extends java.lang.Object implements [android.hardware.biometrics.AuthenticateOptions, android.os.Parcelable]\n@com.android.internal.util.DataClass(genParcelable=true, genAidl=true, genBuilder=true, genSetters=true, genEqualsHashCode=true)")

    @Deprecated

    private void __metadata() {}

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

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ interface IFaceService { 
    // by BiometricService. To start authentication after the clients are ready, use

    // startPreparedClient().

    @EnforcePermission("USE_BIOMETRIC_INTERNAL")

    void prepareForAuthentication(int sensorId, boolean requireConfirmation, IBinder token,

    void prepareForAuthentication(boolean requireConfirmation, IBinder token,

            long operationId, IBiometricSensorReceiver sensorReceiver,

            in FaceAuthenticateOptions options, long requestId, int cookie,

            boolean allowBackgroundAuthentication);

core/java/android/hardware/fingerprint/FingerprintAuthenticateOptions.java

+12 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public final class FingerprintAuthenticateOptions implements AuthenticateOptions 
    }



    /** The sensor id for this operation. */

    private final int mSensorId;

    private int mSensorId;

    private static int defaultSensorId() {

        return SENSOR_ID_ANY;

    }
@@ -175,6 +175,15 @@ public final class FingerprintAuthenticateOptions implements AuthenticateOptions 
        return mAttributionTag;

    }



    /**

     * The sensor id for this operation.

     */

    @DataClass.Generated.Member

    public @NonNull FingerprintAuthenticateOptions setSensorId( int value) {

        mSensorId = value;

        return this;

    }



    /**

     * The package name for that operation that should be used for

     * {@link android.app.AppOpsManager} verification.
@@ -433,10 +442,10 @@ public final class FingerprintAuthenticateOptions implements AuthenticateOptions 
    }



    @DataClass.Generated(

            time = 1676508212083L,

            time = 1677119626721L,

            codegenVersion = "1.0.23",

            sourceFile = "frameworks/base/core/java/android/hardware/fingerprint/FingerprintAuthenticateOptions.java",

            inputSignatures = "private final  int mUserId\nprivate final  int mSensorId\nprivate final  boolean mIgnoreEnrollmentState\nprivate final @android.hardware.biometrics.AuthenticateOptions.DisplayState int mDisplayState\nprivate @android.annotation.NonNull java.lang.String mOpPackageName\nprivate @android.annotation.Nullable java.lang.String mAttributionTag\nprivate static  int defaultUserId()\nprivate static  int defaultSensorId()\nprivate static  boolean defaultIgnoreEnrollmentState()\nprivate static  int defaultDisplayState()\nprivate static  java.lang.String defaultOpPackageName()\nprivate static  java.lang.String defaultAttributionTag()\nclass FingerprintAuthenticateOptions extends java.lang.Object implements [android.hardware.biometrics.AuthenticateOptions, android.os.Parcelable]\n@com.android.internal.util.DataClass(genParcelable=true, genAidl=true, genBuilder=true, genSetters=true, genEqualsHashCode=true)")

            inputSignatures = "private final  int mUserId\nprivate  int mSensorId\nprivate final  boolean mIgnoreEnrollmentState\nprivate final @android.hardware.biometrics.AuthenticateOptions.DisplayState int mDisplayState\nprivate @android.annotation.NonNull java.lang.String mOpPackageName\nprivate @android.annotation.Nullable java.lang.String mAttributionTag\nprivate static  int defaultUserId()\nprivate static  int defaultSensorId()\nprivate static  boolean defaultIgnoreEnrollmentState()\nprivate static  int defaultDisplayState()\nprivate static  java.lang.String defaultOpPackageName()\nprivate static  java.lang.String defaultAttributionTag()\nclass FingerprintAuthenticateOptions extends java.lang.Object implements [android.hardware.biometrics.AuthenticateOptions, android.os.Parcelable]\n@com.android.internal.util.DataClass(genParcelable=true, genAidl=true, genBuilder=true, genSetters=true, genEqualsHashCode=true)")

    @Deprecated

    private void __metadata() {}

core/java/android/hardware/fingerprint/IFingerprintService.aidl

+2 −2
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ interface IFingerprintService { 
    // by BiometricService. To start authentication after the clients are ready, use

    // startPreparedClient().

    @EnforcePermission("MANAGE_BIOMETRIC")

    void prepareForAuthentication(int sensorId, IBinder token, long operationId, int userId,

            IBiometricSensorReceiver sensorReceiver, String opPackageName, long requestId,

    void prepareForAuthentication(IBinder token, long operationId,

            IBiometricSensorReceiver sensorReceiver, in FingerprintAuthenticateOptions options, long requestId,

            int cookie, boolean allowBackgroundAuthentication);



    // Starts authentication with the previously prepared client.

services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java

+8 −6
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.app.ActivityTaskManager; 
import android.app.TaskStackListener;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.hardware.biometrics.AuthenticateOptions;

import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.biometrics.BiometricConstants;

import android.hardware.biometrics.BiometricManager;
@@ -44,8 +45,8 @@ import java.util.function.Supplier; 
/**

 * A class to keep track of the authentication state for a given client.

 */

public abstract class AuthenticationClient<T> extends AcquisitionClient<T>

        implements AuthenticationConsumer {

public abstract class AuthenticationClient<T, O extends AuthenticateOptions>

        extends AcquisitionClient<T> implements AuthenticationConsumer {



    // New, has not started yet

    public static final int STATE_NEW = 0;
@@ -89,14 +90,15 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> 


    public AuthenticationClient(@NonNull Context context, @NonNull Supplier<T> lazyDaemon,

            @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener,

            int targetUserId, long operationId, boolean restricted, @NonNull String owner,

            int cookie, boolean requireConfirmation, int sensorId,

            long operationId, boolean restricted, @NonNull O options,

            int cookie, boolean requireConfirmation,

            @NonNull BiometricLogger biometricLogger, @NonNull BiometricContext biometricContext,

            boolean isStrongBiometric, @Nullable TaskStackListener taskStackListener,

            @NonNull LockoutTracker lockoutTracker, boolean allowBackgroundAuthentication,

            boolean shouldVibrate, int sensorStrength) {

        super(context, lazyDaemon, token, listener, targetUserId, owner, cookie, sensorId,

                shouldVibrate, biometricLogger, biometricContext);

        super(context, lazyDaemon, token, listener, options.getUserId(),

                options.getOpPackageName(), cookie, options.getSensorId(), shouldVibrate,

                biometricLogger, biometricContext);

        mIsStrongBiometric = isStrongBiometric;

        mOperationId = operationId;

        mRequireConfirmation = requireConfirmation;