DO NOT MERGE Mask case of base or tree permission being null

Bug: 34850544
Change-Id: I4bf9e85d7e615ccdb75752503e58d7e7f47b04c2

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 75da128..93f5f47 100644 (file)
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -3960,6 +3960,10 @@ public class PackageManagerService extends IPackageManager.Stub {
                     "Not allowed to modify non-dynamic permission "
                     + info.name);
         } else {
+            if ((bp.perm == null) || (tree.perm == null)) {
+                Slog.w(TAG, "Base or tree permission is null: " + bp.perm + ", " + tree.perm);
+                return false;
+            }
             if (bp.protectionLevel == fixedLevel
                     && bp.perm.owner.equals(tree.perm.owner)
                     && bp.uid == tree.uid