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

Merge "Revoke permission on non-runtime -> runtime upgrade"

Browse Source
This commit is contained in:
Philip P. Moltmann
2020-11-04 22:11:37 +00:00
committed by Android (Google) Code Review
parent 2389a16bad 764e41b053
commit 416274754e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/permission/Permission.java
View File

@@ -425,7 +425,7 @@ public final class Permission {
permission = new Permission(permissionInfo.name, permissionInfo.packageName,
TYPE_MANIFEST);
}
boolean wasNormal = permission.isNormal();
boolean wasNonRuntime = !permission.isRuntime();
StringBuilder r = null;
if (!permission.mReconciled) {
if (permission.mPermissionInfo.packageName == null
@@ -465,8 +465,8 @@ public final class Permission {
r.append("DUP:");
r.append(permissionInfo.name);
}
if (permission.isRuntime() && (ownerChanged || wasNormal)) {
// If this is a runtime permission and the owner has changed, or this was a normal
if (permission.isRuntime() && (ownerChanged || wasNonRuntime)) {
// If this is a runtime permission and the owner has changed, or this wasn't a runtime
// permission, then permission state should be cleaned up
permission.mDefinitionChanged = true;
}