commit a4968d6ef8d21ce9ac6e12c0d910975f0bcc6d08
author Jaesik Kong <jaesikkong@google.com> Mon Jul 10 05:28:37 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 10 05:28:37 2023 +0000
tree c694b94d26ca76644efade9361a8819ad729c3f2
parent e3595e6dafe3916808804b8de7556179e40c1d30
parent 2eaf8488392807b00fa7e492661e94a1acc2b20c

Merge "Revert "Update signature permissions when package signing is changed."" into main

services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt

diff --git a/services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt b/services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt
index aa86cd6..d39c8a0 100644
--- a/services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt
+++ b/services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt
@@ -390,14 +390,7 @@
         packageState: PackageState,
         changedPermissionNames: MutableIndexedSet<String>
     ) {
-        val androidPackage = packageState.androidPackage!!
-        // This may not be the same package as the old permission because the old permission owner
-        // can be different, hence using this somewhat strange name to prevent misuse.
-        val oldNewPackage = oldState.externalState.packageStates[packageState.packageName]
-            ?.androidPackage
-        val isPackageSigningChanged = oldNewPackage != null &&
-                androidPackage.signingDetails != oldNewPackage.signingDetails
-        androidPackage.permissions.forEachIndexed { _, parsedPermission ->
+        packageState.androidPackage!!.permissions.forEachIndexed { _, parsedPermission ->
             val newPermissionInfo = PackageInfoUtils.generatePermissionInfo(
                 parsedPermission, PackageManager.GET_META_DATA.toLong()
             )!!
@@ -527,7 +520,7 @@
                     newPackageName != oldPermission.packageName ||
                     newPermission.protectionLevel != oldPermission.protectionLevel || (
                         oldPermission.isReconciled && (
-                            (newPermission.isSignature && isPackageSigningChanged) || (
+                            (
                                 newPermission.isKnownSigner &&
                                     newPermission.knownCerts != oldPermission.knownCerts
                             ) || (