From 764e41b053f6b82d1b7a3fdd5ecd1628b75f5fcb Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Tue, 3 Nov 2020 15:12:44 -0800
Subject: [PATCH] Revoke permission on non-runtime -> runtime upgrade

Not only on normal -> runtime.

Test: atest PermissionEscalationTest
Bug: 154505240, 168319670
Change-Id: If3b420067b4d7111dcf67ae6f98e42176158b679
---
 .../java/com/android/server/pm/permission/Permission.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/pm/permission/Permission.java b/services/core/java/com/android/server/pm/permission/Permission.java
index 4e8ddac885297..0245b28884ead 100644
--- a/services/core/java/com/android/server/pm/permission/Permission.java
+++ b/services/core/java/com/android/server/pm/permission/Permission.java
@@ -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;
         }