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

Commit ecf2bad4 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Automerger Merge Worker
Browse files

Merge changes from topic "12933477" into rvc-dev am: 6a6a15d5 am: 5fe0e5ed am: 69f60a90 

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

Change-Id: I7cfe7b471162ce3e6c94bcc7bddd639a2fbdfeff
parents e8374443 69f60a90

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

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

            bp = new BasePermission(p.getName(), p.getPackageName(), TYPE_NORMAL);

        }

        boolean wasNormal = bp.isNormal();

        boolean wasNonRuntime = !bp.isRuntime();

        StringBuilder r = null;

        if (bp.perm == null) {

            if (bp.sourcePackageName == null
@@ -411,7 +411,7 @@ public final class BasePermission { 
                && Objects.equals(bp.perm.getName(), p.getName())) {

            bp.protectionLevel = p.getProtectionLevel();

        }

        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;