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

Commit 177318a0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change method to PackageManager#getBackgroundPermissionOptionLabel"

parents 1992ebad d60c7851

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11885,7 +11885,7 @@ package android.content.pm { 
    method @NonNull public abstract CharSequence getApplicationLabel(@NonNull android.content.pm.ApplicationInfo);

    method @Nullable public abstract android.graphics.drawable.Drawable getApplicationLogo(@NonNull android.content.pm.ApplicationInfo);

    method @Nullable public abstract android.graphics.drawable.Drawable getApplicationLogo(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;

    method @NonNull public CharSequence getBackgroundPermissionButtonLabel();

    method @NonNull public CharSequence getBackgroundPermissionOptionLabel();

    method @Nullable public abstract android.content.pm.ChangedPackages getChangedPackages(@IntRange(from=0) int);

    method public abstract int getComponentEnabledSetting(@NonNull android.content.ComponentName);

    method @NonNull public abstract android.graphics.drawable.Drawable getDefaultActivityIcon();

core/java/android/app/ApplicationPackageManager.java

+1 −1
Original line number Diff line number Diff line
@@ -868,7 +868,7 @@ public class ApplicationPackageManager extends PackageManager { 
    }



    @Override

    public CharSequence getBackgroundPermissionButtonLabel() {

    public CharSequence getBackgroundPermissionOptionLabel() {

        try {



            String permissionController = getPermissionControllerPackageName();

core/java/android/content/pm/PackageManager.java

+8 −5
Original line number Diff line number Diff line
@@ -4410,14 +4410,17 @@ public abstract class PackageManager { 
    public abstract boolean shouldShowRequestPermissionRationale(@NonNull String permName);



    /**

     * Gets the string that is displayed on the button which corresponds to granting background

     * location in settings. The intended use for this is to help apps instruct users how to

     * grant a background permission by providing the string that users will see.

     * Gets the localized label that corresponds to the option in settings for granting

     * background access.

     *

     * @return the string shown on the button for granting background location

     * <p>The intended use is for apps to reference this label in its instruction for users to grant

     * a background permission.

     *

     * @return the localized label that corresponds to the settings option for granting

     * background access

     */

    @NonNull

    public CharSequence getBackgroundPermissionButtonLabel() {

    public CharSequence getBackgroundPermissionOptionLabel() {

        return "";

    }