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

Commit c8952878 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Rename biometric enroll extra" into rvc-dev am: db45def6 am: a0b5de81 

Change-Id: I0f716538d5f342e45f8ef1f3fc1f695d074b908d
parents a0085ebf a0b5de81

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -40574,7 +40574,7 @@ package android.provider { 
    field public static final String EXTRA_APP_PACKAGE = "android.provider.extra.APP_PACKAGE";

    field public static final String EXTRA_APP_PACKAGE = "android.provider.extra.APP_PACKAGE";

    field public static final String EXTRA_AUTHORITIES = "authorities";

    field public static final String EXTRA_AUTHORITIES = "authorities";

    field public static final String EXTRA_BATTERY_SAVER_MODE_ENABLED = "android.settings.extra.battery_saver_mode_enabled";

    field public static final String EXTRA_BATTERY_SAVER_MODE_ENABLED = "android.settings.extra.battery_saver_mode_enabled";

    field public static final String EXTRA_BIOMETRIC_MINIMUM_STRENGTH_REQUIRED = "android.provider.extra.BIOMETRIC_MINIMUM_STRENGTH_REQUIRED";

    field public static final String EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED = "android.provider.extra.BIOMETRIC_AUTHENTICATORS_ALLOWED";

    field public static final String EXTRA_CHANNEL_ID = "android.provider.extra.CHANNEL_ID";

    field public static final String EXTRA_CHANNEL_ID = "android.provider.extra.CHANNEL_ID";

    field public static final String EXTRA_CONVERSATION_ID = "android.provider.extra.CONVERSATION_ID";

    field public static final String EXTRA_CONVERSATION_ID = "android.provider.extra.CONVERSATION_ID";

    field public static final String EXTRA_DO_NOT_DISTURB_MODE_ENABLED = "android.settings.extra.do_not_disturb_mode_enabled";

    field public static final String EXTRA_DO_NOT_DISTURB_MODE_ENABLED = "android.settings.extra.do_not_disturb_mode_enabled";

core/java/android/provider/Settings.java

+11 −6
Original line number Original line Diff line number Diff line
@@ -703,13 +703,18 @@ public final class Settings { 
     * Weak or above, as defined by the CDD. Only biometrics that meet or exceed Strong, as defined

     * Weak or above, as defined by the CDD. Only biometrics that meet or exceed Strong, as defined

     * in the CDD are allowed to participate in Keystore operations.

     * in the CDD are allowed to participate in Keystore operations.

     * <p>

     * <p>

     * Input: extras {@link #EXTRA_BIOMETRIC_MINIMUM_STRENGTH_REQUIRED} as an integer, with

     * Input: extras {@link #EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED} as an integer, with

     * constants defined in {@link android.hardware.biometrics.BiometricManager.Authenticators},

     * constants defined in {@link android.hardware.biometrics.BiometricManager.Authenticators},

     * e.g. {@link android.hardware.biometrics.BiometricManager.Authenticators#BIOMETRIC_STRONG}.

     * e.g. {@link android.hardware.biometrics.BiometricManager.Authenticators#BIOMETRIC_STRONG}.

     * If not specified, the default behavior is

     * If not specified, the default behavior is

     * {@link android.hardware.biometrics.BiometricManager.Authenticators#BIOMETRIC_WEAK}.

     * {@link android.hardware.biometrics.BiometricManager.Authenticators#BIOMETRIC_WEAK}.

     * <p>

     * <p>

     * Output: Nothing.

     * Output: Returns {@link android.app.Activity#RESULT_CANCELED} if the user already has an

     * authenticator that meets the requirements, or if the device cannot fulfill the request

     * (e.g. does not have biometric hardware). Returns {@link android.app.Activity#RESULT_OK}

     * otherwise. Note that callers should still check

     * {@link android.hardware.biometrics.BiometricManager#canAuthenticate(int)}

     * afterwards to ensure that the user actually completed enrollment.

     */

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_BIOMETRIC_ENROLL =

    public static final String ACTION_BIOMETRIC_ENROLL =
@@ -719,12 +724,12 @@ public final class Settings { 
     * Activity Extra: The minimum strength to request enrollment for.

     * Activity Extra: The minimum strength to request enrollment for.

     * <p>

     * <p>

     * This can be passed as an extra field to the {@link #ACTION_BIOMETRIC_ENROLL} intent to

     * This can be passed as an extra field to the {@link #ACTION_BIOMETRIC_ENROLL} intent to

     * indicate that only enrollment for sensors that meet this strength should be shown. The

     * indicate that only enrollment for sensors that meet these requirements should be shown. The

     * value should be one of the biometric strength constants defined in

     * value should be a combination of the constants defined in

     * {@link android.hardware.biometrics.BiometricManager.Authenticators}.

     * {@link android.hardware.biometrics.BiometricManager.Authenticators}.

     */

     */

    public static final String EXTRA_BIOMETRIC_MINIMUM_STRENGTH_REQUIRED =

    public static final String EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED =

            "android.provider.extra.BIOMETRIC_MINIMUM_STRENGTH_REQUIRED";

            "android.provider.extra.BIOMETRIC_AUTHENTICATORS_ALLOWED";

















    /**







    /**











     * Activity Action: Show settings to allow configuration of cast endpoints.







     * Activity Action: Show settings to allow configuration of cast endpoints.