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

Commit 335c63b2 authored by Jackal Guo's avatar Jackal Guo Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in queryPermissionsByGroup"

parents 0ffeb964 9ba8d36a

services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -624,8 +624,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
        }

        }





        final int callingUserId = UserHandle.getUserId(callingUid);

        final int callingUserId = UserHandle.getUserId(callingUid);

        if (mPackageManagerInt.filterAppAccess(permissionGroup.getPackageName(), callingUid,

        if (permissionGroup != null && mPackageManagerInt.filterAppAccess(

                callingUserId)) {

                permissionGroup.getPackageName(), callingUid, callingUserId)) {

            return null;

            return null;

        }

        }

        out.removeIf(it -> mPackageManagerInt.filterAppAccess(it.packageName, callingUid,

        out.removeIf(it -> mPackageManagerInt.filterAppAccess(it.packageName, callingUid,