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

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

Merge changes from topic "bp-strong" into udc-dev am: 92865c83 

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



Change-Id: I299d1f1b5c9fd7bb810db8f7c4a90fdf635fe9d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2921f229 92865c83

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

+0 −21
Original line number Original line Diff line number Diff line
@@ -96,27 +96,6 @@ public class BiometricManager { 
    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    public @interface BiometricError {}

    public @interface BiometricError {}





    /**

     * Single sensor or unspecified multi-sensor behavior (prefer an explicit choice if the

     * device is multi-sensor).

     * @hide

     */

    public static final int BIOMETRIC_MULTI_SENSOR_DEFAULT = 0;



    /**

     * Use face and fingerprint sensors together.

     * @hide

     */

    public static final int BIOMETRIC_MULTI_SENSOR_FINGERPRINT_AND_FACE = 1;



    /**

     * @hide

     */

    @IntDef({BIOMETRIC_MULTI_SENSOR_DEFAULT,

            BIOMETRIC_MULTI_SENSOR_FINGERPRINT_AND_FACE})

    @Retention(RetentionPolicy.SOURCE)

    public @interface BiometricMultiSensorMode {}



    /**

    /**

     * Types of authenticators, defined at a level of granularity supported by

     * Types of authenticators, defined at a level of granularity supported by

     * {@link BiometricManager} and {@link BiometricPrompt}.

     * {@link BiometricManager} and {@link BiometricPrompt}.

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -29,5 +29,7 @@ oneway interface IBiometricSysuiReceiver { 
    // Notifies the client that an internal event, e.g. back button has occurred.

    // Notifies the client that an internal event, e.g. back button has occurred.

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

    // Notifies that the fingerprint should start now (after onDialogAnimatedIn(false)).

    void onStartFingerprintNow();

}
 
}

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

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

    */

    void showAuthenticationDialog(in PromptInfo promptInfo, IBiometricSysuiReceiver sysuiReceiver,

    void showAuthenticationDialog(in PromptInfo promptInfo, IBiometricSysuiReceiver sysuiReceiver,

            in int[] sensorIds, boolean credentialAllowed, boolean requireConfirmation, int userId,

            in int[] sensorIds, boolean credentialAllowed, boolean requireConfirmation, int userId,

            long operationId, String opPackageName, long requestId, int multiSensorConfig);

            long operationId, String opPackageName, long requestId);

    /**

    /**

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

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

    */

    */

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -123,8 +123,7 @@ interface IStatusBarService 
    // Used to show the authentication dialog (Biometrics, Device Credential)

    // Used to show the authentication dialog (Biometrics, Device Credential)

    void showAuthenticationDialog(in PromptInfo promptInfo, IBiometricSysuiReceiver sysuiReceiver,

    void showAuthenticationDialog(in PromptInfo promptInfo, IBiometricSysuiReceiver sysuiReceiver,

            in int[] sensorIds, boolean credentialAllowed, boolean requireConfirmation,

            in int[] sensorIds, boolean credentialAllowed, boolean requireConfirmation,

            int userId, long operationId, String opPackageName, long requestId,

            int userId, long operationId, String opPackageName, long requestId);

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

    void onBiometricAuthenticated(int modality);

packages/SystemUI/res/layout/auth_biometric_contents.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  ~ limitations under the License.

  -->

  -->



<!-- TODO(b/251476085): inline in biometric_prompt_layout after Biometric*Views are un-flagged -->

<merge xmlns:android="http://schemas.android.com/apk/res/android">

<merge xmlns:android="http://schemas.android.com/apk/res/android">





    <TextView

    <TextView