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

Commit 09a2f96f authored by Hao Dong's avatar Hao Dong Committed by Android (Google) Code Review
Browse files

Merge "Rename permission SET_BIOMETRIC_DIALOG_LOGO to SET_BIOMETRIC_DIALOG_ADVANCED" into main

parents 75c8b599 cf90b3b1

core/api/current.txt

+7 −7
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ package android { 
    field public static final String SET_ALARM = "com.android.alarm.permission.SET_ALARM";

    field public static final String SET_ALWAYS_FINISH = "android.permission.SET_ALWAYS_FINISH";

    field public static final String SET_ANIMATION_SCALE = "android.permission.SET_ANIMATION_SCALE";

    field @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public static final String SET_BIOMETRIC_DIALOG_LOGO = "android.permission.SET_BIOMETRIC_DIALOG_LOGO";

    field @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") public static final String SET_BIOMETRIC_DIALOG_ADVANCED = "android.permission.SET_BIOMETRIC_DIALOG_ADVANCED";

    field public static final String SET_DEBUG_APP = "android.permission.SET_DEBUG_APP";

    field @Deprecated public static final String SET_PREFERRED_APPLICATIONS = "android.permission.SET_PREFERRED_APPLICATIONS";

    field public static final String SET_PROCESS_LIMIT = "android.permission.SET_PROCESS_LIMIT";
@@ -18904,9 +18904,9 @@ package android.hardware.biometrics { 
    method @Nullable public int getAllowedAuthenticators();

    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @Nullable public android.hardware.biometrics.PromptContentView getContentView();

    method @Nullable public CharSequence getDescription();

    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @Nullable @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO) public android.graphics.Bitmap getLogoBitmap();

    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @Nullable @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO) public String getLogoDescription();

    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @DrawableRes @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO) public int getLogoRes();

    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @Nullable @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public android.graphics.Bitmap getLogoBitmap();

    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @Nullable @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public String getLogoDescription();

    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @DrawableRes @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public int getLogoRes();

    method @Nullable public CharSequence getNegativeButtonText();

    method @Nullable public CharSequence getSubtitle();

    method @NonNull public CharSequence getTitle();
@@ -18956,9 +18956,9 @@ package android.hardware.biometrics { 
    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setContentView(@NonNull android.hardware.biometrics.PromptContentView);

    method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setDescription(@NonNull CharSequence);

    method @Deprecated @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setDeviceCredentialAllowed(boolean);

    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO) public android.hardware.biometrics.BiometricPrompt.Builder setLogoBitmap(@NonNull android.graphics.Bitmap);

    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO) public android.hardware.biometrics.BiometricPrompt.Builder setLogoDescription(@NonNull String);

    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO) public android.hardware.biometrics.BiometricPrompt.Builder setLogoRes(@DrawableRes int);

    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public android.hardware.biometrics.BiometricPrompt.Builder setLogoBitmap(@NonNull android.graphics.Bitmap);

    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public android.hardware.biometrics.BiometricPrompt.Builder setLogoDescription(@NonNull String);

    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED) public android.hardware.biometrics.BiometricPrompt.Builder setLogoRes(@DrawableRes int);

    method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setNegativeButton(@NonNull CharSequence, @NonNull java.util.concurrent.Executor, @NonNull android.content.DialogInterface.OnClickListener);

    method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setSubtitle(@NonNull CharSequence);

    method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setTitle(@NonNull CharSequence);

core/java/android/hardware/biometrics/BiometricPrompt.java

+7 −7
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.hardware.biometrics;



import static android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO;

import static android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED;

import static android.Manifest.permission.TEST_BIOMETRIC;

import static android.Manifest.permission.USE_BIOMETRIC;

import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL;
@@ -175,7 +175,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
         * @return This builder.

         */

        @FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)

        @RequiresPermission(SET_BIOMETRIC_DIALOG_LOGO)

        @RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)

        @NonNull

        public BiometricPrompt.Builder setLogoRes(@DrawableRes int logoRes) {

            mPromptInfo.setLogoRes(logoRes);
@@ -194,7 +194,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
         * @return This builder.

         */

        @FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)

        @RequiresPermission(SET_BIOMETRIC_DIALOG_LOGO)

        @RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)

        @NonNull

        public BiometricPrompt.Builder setLogoBitmap(@NonNull Bitmap logoBitmap) {

            mPromptInfo.setLogoBitmap(logoBitmap);
@@ -213,7 +213,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
         * @return This builder.

         */

        @FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)

        @RequiresPermission(SET_BIOMETRIC_DIALOG_LOGO)

        @RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)

        @NonNull

        public BiometricPrompt.Builder setLogoDescription(@NonNull String logoDescription) {

            mPromptInfo.setLogoDescription(logoDescription);
@@ -766,7 +766,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
     * @return The drawable resource of the logo, or -1 if the prompt has no logo resource set.

     */

    @FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)

    @RequiresPermission(SET_BIOMETRIC_DIALOG_LOGO)

    @RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)

    @DrawableRes

    public int getLogoRes() {

        return mPromptInfo.getLogoRes();
@@ -779,7 +779,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
     * @return The logo bitmap of the prompt, or null if the prompt has no logo bitmap set.

     */

    @FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)

    @RequiresPermission(SET_BIOMETRIC_DIALOG_LOGO)

    @RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)

    @Nullable

    public Bitmap getLogoBitmap() {

        return mPromptInfo.getLogoBitmap();
@@ -794,7 +794,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
     * set.

     */

    @FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)

    @RequiresPermission(SET_BIOMETRIC_DIALOG_LOGO)

    @RequiresPermission(SET_BIOMETRIC_DIALOG_ADVANCED)

    @Nullable

    public String getLogoDescription() {

        return mPromptInfo.getLogoDescription();

core/java/android/hardware/biometrics/PromptInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public class PromptInfo implements Parcelable { 
    }



    /**

     * Returns whether SET_BIOMETRIC_DIALOG_LOGO is contained.

     * Returns whether SET_BIOMETRIC_DIALOG_ADVANCED is contained.

     */

    public boolean containsSetLogoApiConfigurations() {

        if (mLogoRes != -1) {

core/res/AndroidManifest.xml

+3 −2
Original line number Diff line number Diff line
@@ -6776,11 +6776,12 @@ 
    <permission android:name="android.permission.MANAGE_BIOMETRIC_DIALOG"

                android:protectionLevel="signature" />



    <!-- Allows an application to set the BiometricDialog (SystemUI) logo .

    <!-- Allows an application to set the advanced features on BiometricDialog (SystemUI), including

         logo, logo description.

         <p>Not for use by third-party applications.

         @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt")

    -->

    <permission android:name="android.permission.SET_BIOMETRIC_DIALOG_LOGO"

    <permission android:name="android.permission.SET_BIOMETRIC_DIALOG_ADVANCED"

                android:protectionLevel="signature|privileged" />



    <!-- Allows an application to control keyguard.  Only allowed for system processes.

data/etc/privapp-permissions-platform.xml

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ applications that come with the platform 
        <!-- Permissions required for CTS test - android.server.biometrics -->

        <permission name="android.permission.USE_BIOMETRIC" />

        <permission name="android.permission.TEST_BIOMETRIC" />

        <permission name="android.permission.SET_BIOMETRIC_DIALOG_LOGO" />

        <permission name="android.permission.SET_BIOMETRIC_DIALOG_ADVANCED" />

        <permission name="android.permission.MANAGE_BIOMETRIC_DIALOG" />

        <!-- Permissions required for CTS test - CtsContactsProviderTestCases -->

        <permission name="android.contacts.permission.MANAGE_SIM_ACCOUNTS" />