diff options
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/permission/PermissionManager.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 4c49f1d301db..4208a8a5298e 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -12582,7 +12582,7 @@ package android.content.pm { method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivityOptions(@Nullable android.content.ComponentName, @Nullable android.content.Intent[], @NonNull android.content.Intent, int); method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(@NonNull android.content.Intent, int); method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentServices(@NonNull android.content.Intent, int); - method @NonNull public abstract java.util.List<android.content.pm.PermissionInfo> queryPermissionsByGroup(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; + method @NonNull public abstract java.util.List<android.content.pm.PermissionInfo> queryPermissionsByGroup(@Nullable String, int) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryProviderProperty(@NonNull String); method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryReceiverProperty(@NonNull String); method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryServiceProperty(@NonNull String); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 99bbcdea06fc..07d8478da553 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -4605,7 +4605,7 @@ public abstract class PackageManager { * Query for all of the permissions associated with a particular group. * * @param permissionGroup The fully qualified name (i.e. com.google.permission.LOGIN) - * of the permission group you are interested in. Use null to + * of the permission group you are interested in. Use {@code null} to * find all of the permissions not associated with a group. * @param flags Additional option flags to modify the data returned. * @return Returns a list of {@link PermissionInfo} containing information @@ -4615,7 +4615,7 @@ public abstract class PackageManager { */ //@Deprecated @NonNull - public abstract List<PermissionInfo> queryPermissionsByGroup(@NonNull String permissionGroup, + public abstract List<PermissionInfo> queryPermissionsByGroup(@Nullable String permissionGroup, @PermissionInfoFlags int flags) throws NameNotFoundException; /** diff --git a/core/java/android/permission/PermissionManager.java b/core/java/android/permission/PermissionManager.java index 17c90d64ce6a..d490e7a7b454 100644 --- a/core/java/android/permission/PermissionManager.java +++ b/core/java/android/permission/PermissionManager.java @@ -195,7 +195,7 @@ public final class PermissionManager { * @hide Pending API */ @Nullable - public List<PermissionInfo> queryPermissionsByGroup(@NonNull String groupName, + public List<PermissionInfo> queryPermissionsByGroup(@Nullable String groupName, @PackageManager.PermissionInfoFlags int flags) { try { final ParceledListSlice<PermissionInfo> parceledList = |