Merge "Fix NPE introduced by ag/16740473." into tm-dev

2022-03-03 23:04:40 +00:00
parent 8819133efc c9a82cd3b8
commit c6c97b7b84
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -2554,6 +2554,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
            for (int i = 0; i < packagesSize; i++) {
                AndroidPackageApi sharedUserPackage =
                        packages.valueAt(i).getAndroidPackage();
+                if (sharedUserPackage == null) {
+                    continue;
+                }
                uidRequestedPermissions.addAll(
                        sharedUserPackage.getRequestedPermissions());
                uidImplicitPermissions.addAll(