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

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

Merge changes from topic "coex-again-2" into tm-dev am: 532df4fc 

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

Change-Id: I9a50e837b0d781fdfbaa910912dd577653f96d49
parents a989e145 532df4fc

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -104,16 +104,16 @@ public class BiometricManager { 
    public static final int BIOMETRIC_MULTI_SENSOR_DEFAULT = 0;

    public static final int BIOMETRIC_MULTI_SENSOR_DEFAULT = 0;





    /**

    /**

     * Prefer the face sensor and fall back to fingerprint when needed.

     * Use face and fingerprint sensors together.

     * @hide

     * @hide

     */

     */

    public static final int BIOMETRIC_MULTI_SENSOR_FACE_THEN_FINGERPRINT = 1;

    public static final int BIOMETRIC_MULTI_SENSOR_FINGERPRINT_AND_FACE = 1;





    /**

    /**

     * @hide

     * @hide

     */

     */

    @IntDef({BIOMETRIC_MULTI_SENSOR_DEFAULT,

    @IntDef({BIOMETRIC_MULTI_SENSOR_DEFAULT,

            BIOMETRIC_MULTI_SENSOR_FACE_THEN_FINGERPRINT})

            BIOMETRIC_MULTI_SENSOR_FINGERPRINT_AND_FACE})

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    public @interface BiometricMultiSensorMode {}

    public @interface BiometricMultiSensorMode {}

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ interface IBiometricService { 




    // Notify BiometricService when <Biometric>Service is ready to start the prepared client.

    // Notify BiometricService when <Biometric>Service is ready to start the prepared client.

    // Client lifecycle is still managed in <Biometric>Service.

    // Client lifecycle is still managed in <Biometric>Service.

    void onReadyForAuthentication(int cookie);

    void onReadyForAuthentication(long requestId, int cookie);





    // Requests all BIOMETRIC_STRONG sensors to have their authenticatorId invalidated for the

    // Requests all BIOMETRIC_STRONG sensors to have their authenticatorId invalidated for the

    // specified user. This happens when enrollments have been added on devices with multiple

    // specified user. This happens when enrollments have been added on devices with multiple

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -30,6 +30,4 @@ oneway interface IBiometricSysuiReceiver { 
    void onSystemEvent(int event);

    void onSystemEvent(int event);

    // Notifies that the dialog has finished animating.

    // Notifies that the dialog has finished animating.

    void onDialogAnimatedIn();

    void onDialogAnimatedIn();

    // For multi-sensor devices, notifies that the fingerprint should start now.

    void onStartFingerprintNow();

}
 
}

core/java/com/android/internal/statusbar/IStatusBar.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -159,7 +159,7 @@ oneway interface IStatusBar 
    /**

    /**

    * Used to notify the authentication dialog that a biometric has been authenticated.

    * Used to notify the authentication dialog that a biometric has been authenticated.

    */

    */

    void onBiometricAuthenticated();

    void onBiometricAuthenticated(int modality);

    /**

    /**

    * Used to set a temporary message, e.g. fingerprint not recognized, finger moved too fast, etc.

    * Used to set a temporary message, e.g. fingerprint not recognized, finger moved too fast, etc.

    */

    */

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -125,7 +125,7 @@ interface IStatusBarService 
            int multiSensorConfig);

            int multiSensorConfig);





    // Used to notify the authentication dialog that a biometric has been authenticated

    // Used to notify the authentication dialog that a biometric has been authenticated

    void onBiometricAuthenticated();

    void onBiometricAuthenticated(int modality);

    // Used to set a temporary message, e.g. fingerprint not recognized, finger moved too fast, etc

    // Used to set a temporary message, e.g. fingerprint not recognized, finger moved too fast, etc

    void onBiometricHelp(int modality, String message);

    void onBiometricHelp(int modality, String message);

    // Used to show an error - the dialog will dismiss after a certain amount of time

    // Used to show an error - the dialog will dismiss after a certain amount of time