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

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

Merge "Add a public permission and rename setters of bp logo." into main

parents 4fe084cc 1ea5d06f

core/api/current.txt

+5 −4
Original line number Diff line number Diff line
@@ -285,6 +285,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 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";
@@ -18723,8 +18724,8 @@ 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.permission.MANAGE_BIOMETRIC_DIALOG") public android.graphics.Bitmap getLogoBitmap();

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

    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") @DrawableRes @RequiresPermission(android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO) public int getLogoRes();

    method @Nullable public CharSequence getNegativeButtonText();

    method @Nullable public CharSequence getSubtitle();

    method @NonNull public CharSequence getTitle();
@@ -18774,8 +18775,8 @@ 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.permission.MANAGE_BIOMETRIC_DIALOG") public android.hardware.biometrics.BiometricPrompt.Builder setLogo(@DrawableRes int);

    method @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") @NonNull @RequiresPermission("android.permission.MANAGE_BIOMETRIC_DIALOG") public android.hardware.biometrics.BiometricPrompt.Builder setLogo(@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 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 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

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


package android.hardware.biometrics;



import static android.Manifest.permission.MANAGE_BIOMETRIC_DIALOG;

import static android.Manifest.permission.SET_BIOMETRIC_DIALOG_LOGO;

import static android.Manifest.permission.TEST_BIOMETRIC;

import static android.Manifest.permission.USE_BIOMETRIC;

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

         */

        @FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)

        @RequiresPermission(MANAGE_BIOMETRIC_DIALOG)

        @RequiresPermission(SET_BIOMETRIC_DIALOG_LOGO)

        @NonNull

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

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

            mPromptInfo.setLogoRes(logoRes);

            return this;

        }
@@ -193,9 +193,9 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
         * @return This builder.

         */

        @FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)

        @RequiresPermission(MANAGE_BIOMETRIC_DIALOG)

        @RequiresPermission(SET_BIOMETRIC_DIALOG_LOGO)

        @NonNull

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

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

            mPromptInfo.setLogoBitmap(logoBitmap);

            return this;

        }
@@ -719,25 +719,25 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 


    /**

     * Gets the drawable resource of the logo for the prompt, as set by

     * {@link Builder#setLogo(int)}. Currently for system applications use only.

     * {@link Builder#setLogoRes(int)}. Currently for system applications use only.

     *

     * @return The drawable resource of the logo, or -1 if the prompt has no logo resource set.

     */

    @FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)

    @RequiresPermission(MANAGE_BIOMETRIC_DIALOG)

    @RequiresPermission(SET_BIOMETRIC_DIALOG_LOGO)

    @DrawableRes

    public int getLogoRes() {

        return mPromptInfo.getLogoRes();

    }



    /**

     * Gets the logo bitmap for the prompt, as set by {@link Builder#setLogo(Bitmap)}. Currently for

     * system applications use only.

     * Gets the logo bitmap for the prompt, as set by {@link Builder#setLogoBitmap(Bitmap)}.

     * Currently for system applications use only.

     *

     * @return The logo bitmap of the prompt, or null if the prompt has no logo bitmap set.

     */

    @FlaggedApi(FLAG_CUSTOM_BIOMETRIC_PROMPT)

    @RequiresPermission(MANAGE_BIOMETRIC_DIALOG)

    @RequiresPermission(SET_BIOMETRIC_DIALOG_LOGO)

    @Nullable

    public Bitmap getLogoBitmap() {

        return mPromptInfo.getLogoBitmap();

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

+2 −2
Original line number Diff line number Diff line
@@ -166,9 +166,9 @@ public class PromptInfo implements Parcelable { 
    }



    /**

     * Returns whether MANAGE_BIOMETRIC_DIALOG is contained.

     * Returns whether SET_BIOMETRIC_DIALOG_LOGO is contained.

     */

    public boolean containsManageBioApiConfigurations() {

    public boolean containsSetLogoApiConfigurations() {

        if (mLogoRes != -1) {

            return true;

        } else if (mLogoBitmap != null) {

core/res/AndroidManifest.xml

+8 −1
Original line number Diff line number Diff line
@@ -6656,6 +6656,13 @@ 
    <permission android:name="android.permission.MANAGE_BIOMETRIC_DIALOG"

                android:protectionLevel="signature" />



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

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

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

    -->

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

                android:protectionLevel="signature" />



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

        @hide -->

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

data/etc/privapp-permissions-platform.xml

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,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.MANAGE_BIOMETRIC_DIALOG" />

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

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

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

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