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

Commit da1ea4bc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "12933388" into qt-dev am: ebf67ea3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12986651

Change-Id: I1893ed21bd88dbb1a29133c829fcb63f1485a326
parents f31a906e ebf67ea3

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

+2 −2
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ public final class BasePermission { 
        if (bp == null) {

            bp = new BasePermission(p.info.name, p.info.packageName, TYPE_NORMAL);

        }

        boolean wasNormal = bp.isNormal();

        boolean wasNonRuntime = !bp.isRuntime();

        StringBuilder r = null;

        if (bp.perm == null) {

            if (bp.sourcePackageName == null
@@ -409,7 +409,7 @@ public final class BasePermission { 
        if (bp.perm == p) {

            bp.protectionLevel = p.info.protectionLevel;

        }

        if (bp.isRuntime() && (ownerChanged || wasNormal)) {

        if (bp.isRuntime() && (ownerChanged || wasNonRuntime)) {

            // If this is a runtime permission and the owner has changed, or this was a normal

            // permission, then permission state should be cleaned up

            bp.mPermissionDefinitionChanged = true;