Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "12933477" into rvc-dev am: 6a6a15d595

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

Change-Id: I37e37b032af51ba82edc6fa7ebc4990d986eda0f
This commit is contained in:
Philip P. Moltmann
2020-11-05 23:39:36 +00:00
committed by Automerger Merge Worker
parent eeae60d82f 6a6a15d595
commit 38540db913
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/permission/BasePermission.java
View File

@@ -367,7 +367,7 @@ public final class BasePermission {
if (bp == null) { if (bp == null) {
bp = new BasePermission(p.getName(), p.getPackageName(), TYPE_NORMAL); bp = new BasePermission(p.getName(), p.getPackageName(), TYPE_NORMAL);
} }
boolean wasNormal = bp.isNormal(); boolean wasNonRuntime = !bp.isRuntime();
StringBuilder r = null; StringBuilder r = null;
if (bp.perm == null) { if (bp.perm == null) {
if (bp.sourcePackageName == null if (bp.sourcePackageName == null
@@ -411,7 +411,7 @@ public final class BasePermission {
&& Objects.equals(bp.perm.getName(), p.getName())) { && Objects.equals(bp.perm.getName(), p.getName())) {
bp.protectionLevel = p.getProtectionLevel(); 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 // If this is a runtime permission and the owner has changed, or this was a normal
// permission, then permission state should be cleaned up // permission, then permission state should be cleaned up
bp.mPermissionDefinitionChanged = true; bp.mPermissionDefinitionChanged = true;