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

Commit a04597b8 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Deprecate ACTION_FINGERPRINT_ENROLL and add ACTION_BIOMETRIC_ENROLL"

parents 358a6676 5660e918

api/current.txt

+3 −1
Original line number Diff line number Diff line
@@ -39145,6 +39145,7 @@ package android.provider { 
    field public static final String ACTION_APP_SEARCH_SETTINGS = "android.settings.APP_SEARCH_SETTINGS";

    field public static final String ACTION_APP_USAGE_SETTINGS = "android.settings.action.APP_USAGE_SETTINGS";

    field public static final String ACTION_BATTERY_SAVER_SETTINGS = "android.settings.BATTERY_SAVER_SETTINGS";

    field public static final String ACTION_BIOMETRIC_ENROLL = "android.settings.BIOMETRIC_ENROLL";

    field public static final String ACTION_BLUETOOTH_SETTINGS = "android.settings.BLUETOOTH_SETTINGS";

    field public static final String ACTION_CAPTIONING_SETTINGS = "android.settings.CAPTIONING_SETTINGS";

    field public static final String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";
@@ -39156,7 +39157,7 @@ package android.provider { 
    field public static final String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";

    field public static final String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";

    field public static final String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS";

    field public static final String ACTION_FINGERPRINT_ENROLL = "android.settings.FINGERPRINT_ENROLL";

    field @Deprecated public static final String ACTION_FINGERPRINT_ENROLL = "android.settings.FINGERPRINT_ENROLL";

    field public static final String ACTION_HARD_KEYBOARD_SETTINGS = "android.settings.HARD_KEYBOARD_SETTINGS";

    field public static final String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS";

    field public static final String ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS = "android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS";
@@ -39219,6 +39220,7 @@ package android.provider { 
    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_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_CHANNEL_ID = "android.provider.extra.CHANNEL_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_MINUTES = "android.settings.extra.do_not_disturb_mode_minutes";

core/java/android/provider/Settings.java

+31 −0
Original line number Diff line number Diff line
@@ -568,15 +568,46 @@ public final class Settings { 
    /**

     * Activity Action: Show settings to enroll fingerprints, and setup PIN/Pattern/Pass if

     * necessary.

     * @deprecated See {@link #ACTION_BIOMETRIC_ENROLL}.

     * <p>

     * Input: Nothing.

     * <p>

     * Output: Nothing.

     */

    @Deprecated

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_FINGERPRINT_ENROLL =

            "android.settings.FINGERPRINT_ENROLL";













    /**













     * Activity Action: Show settings to enroll biometrics, and setup PIN/Pattern/Pass if













     * necessary. By default, this prompts the user to enroll biometrics with strength













     * 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.













     * <p>













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













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













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













     * If not specified, the default behavior is













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













     * <p>













     * Output: Nothing.













     */













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_BIOMETRIC_ENROLL =













            "android.settings.BIOMETRIC_ENROLL";

























    /**













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













     * <p>













     * 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













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













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













     */













    public static final String EXTRA_BIOMETRIC_MINIMUM_STRENGTH_REQUIRED =













            "android.provider.extra.BIOMETRIC_MINIMUM_STRENGTH_REQUIRED";



























    /**















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















     * <p>