diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/ApplicationPackageManager.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 13 |
3 files changed, 10 insertions, 7 deletions
diff --git a/api/current.txt b/api/current.txt index 00b8636e26e6..ab7811902e5b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11865,7 +11865,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(); diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index fd56834ac361..4e6319db97f4 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -868,7 +868,7 @@ public class ApplicationPackageManager extends PackageManager { } @Override - public CharSequence getBackgroundPermissionButtonLabel() { + public CharSequence getBackgroundPermissionOptionLabel() { try { String permissionController = getPermissionControllerPackageName(); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 925d70cdc855..7847dfbe8786 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -4386,14 +4386,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 ""; } |