Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d92fd81 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 44de40fd 8f6290db

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/content/pm/PackageManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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;



    /**

core/java/android/permission/PermissionManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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 =