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

Revoke permission on non-runtime -> runtime upgrade

Browse Source 
Not only on normal -> runtime.

Test: atest PermissionEscalationTest
Bug: 154505240, 168319670
Change-Id: If3b420067b4d7111dcf67ae6f98e42176158b679
This commit is contained in:
Philip P. Moltmann
2020-11-03 15:12:44 -08:00
parent 143108846a
commit 764e41b053
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, permission = new Permission(permissionInfo.name, permissionInfo.packageName,
TYPE_MANIFEST); TYPE_MANIFEST);
} }
boolean wasNormal = permission.isNormal(); boolean wasNonRuntime = !permission.isRuntime();
StringBuilder r = null; StringBuilder r = null;
if (!permission.mReconciled) { if (!permission.mReconciled) {
if (permission.mPermissionInfo.packageName == null if (permission.mPermissionInfo.packageName == null
@@ -465,8 +465,8 @@ public final class Permission {
r.append("DUP:"); r.append("DUP:");
r.append(permissionInfo.name); r.append(permissionInfo.name);
} }
if (permission.isRuntime() && (ownerChanged || wasNormal)) { if (permission.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 wasn't a runtime
// permission, then permission state should be cleaned up // permission, then permission state should be cleaned up
permission.mDefinitionChanged = true; permission.mDefinitionChanged = true;
} }