Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix nullability of the group name parameter in queryPermissionsByGroup()." into sc-dev am: 1d92fd8123

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14391263

Change-Id: I1b5b0ade00b476ff581ae79abf6a2dedd8b46ae5
This commit is contained in:
TreeHugger Robot
2021-05-03 15:20:58 +00:00
committed by Automerger Merge Worker
parent 0a89cdca72 1d92fd8123
commit 36036c0a79
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -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> 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> 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.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> 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> queryReceiverProperty(@NonNull String);
method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryServiceProperty(@NonNull String); method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryServiceProperty(@NonNull String);

4
core/java/android/content/pm/PackageManager.java
View File

@@ -4605,7 +4605,7 @@ public abstract class PackageManager {
* Query for all of the permissions associated with a particular group. * Query for all of the permissions associated with a particular group.
* *
* @param permissionGroup The fully qualified name (i.e. com.google.permission.LOGIN) * @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. * find all of the permissions not associated with a group.
* @param flags Additional option flags to modify the data returned. * @param flags Additional option flags to modify the data returned.
* @return Returns a list of {@link PermissionInfo} containing information * @return Returns a list of {@link PermissionInfo} containing information
@@ -4615,7 +4615,7 @@ public abstract class PackageManager {
*/ */
//@Deprecated //@Deprecated
@NonNull @NonNull
public abstract List<PermissionInfo> queryPermissionsByGroup(@NonNull String permissionGroup, public abstract List<PermissionInfo> queryPermissionsByGroup(@Nullable String permissionGroup,
@PermissionInfoFlags int flags) throws NameNotFoundException; @PermissionInfoFlags int flags) throws NameNotFoundException;
/** /**

2
core/java/android/permission/PermissionManager.java
View File

@@ -195,7 +195,7 @@ public final class PermissionManager {
* @hide Pending API * @hide Pending API
*/ */
@Nullable @Nullable
public List<PermissionInfo> queryPermissionsByGroup(@NonNull String groupName, public List<PermissionInfo> queryPermissionsByGroup(@Nullable String groupName,
@PackageManager.PermissionInfoFlags int flags) { @PackageManager.PermissionInfoFlags int flags) {
try { try {
final ParceledListSlice<PermissionInfo> parceledList = final ParceledListSlice<PermissionInfo> parceledList =