diff options
| -rw-r--r-- | core/java/android/content/pm/PackageItemInfo.java | 8 | ||||
| -rw-r--r-- | core/java/android/permissionpresenterservice/RuntimePermissionPresenterService.java | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/core/java/android/content/pm/PackageItemInfo.java b/core/java/android/content/pm/PackageItemInfo.java index 963f881e36d9..19af609a3e48 100644 --- a/core/java/android/content/pm/PackageItemInfo.java +++ b/core/java/android/content/pm/PackageItemInfo.java @@ -102,7 +102,13 @@ public class PackageItemInfo { private static volatile boolean sForceSafeLabels = false; - /** {@hide} */ + /** + * Always use {@link #loadSafeLabel safe labels} when calling {@link #loadLabel}. + * + * @param forceSafeLabels {@code true} to enforce safe labels + * + * @hide + */ @SystemApi public static void setForceSafeLabels(boolean forceSafeLabels) { sForceSafeLabels = forceSafeLabels; diff --git a/core/java/android/permissionpresenterservice/RuntimePermissionPresenterService.java b/core/java/android/permissionpresenterservice/RuntimePermissionPresenterService.java index f2da21e818f5..18aea03315ef 100644 --- a/core/java/android/permissionpresenterservice/RuntimePermissionPresenterService.java +++ b/core/java/android/permissionpresenterservice/RuntimePermissionPresenterService.java @@ -16,6 +16,7 @@ package android.permissionpresenterservice; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.app.Service; import android.content.Context; @@ -73,12 +74,13 @@ public abstract class RuntimePermissionPresenterService extends Service { public abstract List<RuntimePermissionPresentationInfo> onGetAppPermissions(String packageName); /** - * Revoke the permission {@code permissionName} for app {@code packageName} + * Revokes the permission {@code permissionName} for app {@code packageName} * * @param packageName The package for which to revoke * @param permissionName The permission to revoke */ - public abstract void onRevokeRuntimePermission(String packageName, String permissionName); + public abstract void onRevokeRuntimePermission(@NonNull String packageName, + @NonNull String permissionName); @Override public final IBinder onBind(Intent intent) { |