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

Commit cb8a640c authored by Erik Wolsheimer's avatar Erik Wolsheimer
Browse files

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

Bug: 34850544
Change-Id: I4bf9e85d7e615ccdb75752503e58d7e7f47b04c2
parent 2c42db20

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

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