diff options
| author | Hai Zhang <zhanghai@google.com> | 2021-04-30 21:14:09 +0000 |
|---|---|---|
| committer | Hai Zhang <zhanghai@google.com> | 2021-04-30 21:43:05 +0000 |
| commit | 8f6290db77c996bbdfee35d0dbef48ecf014a7d9 (patch) | |
| tree | bdf37124ad32ab0eaf74c34d87d46615c3907346 /core/java/android | |
| parent | 748c3a8040f9981493a88940505890f9d9940bbf (diff) | |
Fix nullability of the group name parameter in queryPermissionsByGroup().
Change-Id: Id503da0fe4f16a92997634089fc052d58e78f9df
Fixes: 141452667
Test: presubmit
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/permission/PermissionManager.java | 2 |
2 files changed, 3 insertions, 3 deletions
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 = |