From 2eaf8488392807b00fa7e492661e94a1acc2b20c Mon Sep 17 00:00:00 2001 From: Sam Dubey Date: Sun, 9 Jul 2023 23:50:22 +0000 Subject: [PATCH] Revert "Update signature permissions when package signing is changed." This reverts commit 88c2406eb4f30ad788972054f5ac74cc9b682939. Reason for revert: Potentially causing b/290420792, will verify Change-Id: I814c843f0e92b9dab0ea3f33e8815d1153882fd3 --- .../access/permission/AppIdPermissionPolicy.kt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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 aa86cd6323b90..d39c8a0a11020 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 @@ class AppIdPermissionPolicy : SchemePolicy() { packageState: PackageState, changedPermissionNames: MutableIndexedSet ) { - 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 @@ class AppIdPermissionPolicy : SchemePolicy() { newPackageName != oldPermission.packageName || newPermission.protectionLevel != oldPermission.protectionLevel || ( oldPermission.isReconciled && ( - (newPermission.isSignature && isPackageSigningChanged) || ( + ( newPermission.isKnownSigner && newPermission.knownCerts != oldPermission.knownCerts ) || (