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

Commit 43b98a8f authored by Erik Wolsheimer's avatar Erik Wolsheimer Committed by android-build-merger
Browse files

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

am: 28fc6a28

Change-Id: Ia0dab8845a34753ed46199462a9e12c25f9a615f
parents b86a7e8d 28fc6a28

services/core/java/com/android/server/pm/PackageManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -3985,6 +3985,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