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

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

Browse Source
This commit is contained in:
Jaesik Kong
2023-07-10 05:28:37 +00:00
committed by Android (Google) Code Review
parent e3595e6daf 2eaf848839
commit a4968d6ef8
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt
View File

@@ -390,14 +390,7 @@ class AppIdPermissionPolicy : SchemePolicy() {
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 @@ class AppIdPermissionPolicy : SchemePolicy() {
newPackageName != oldPermission.packageName ||
newPermission.protectionLevel != oldPermission.protectionLevel || (
oldPermission.isReconciled && (
(newPermission.isSignature && isPackageSigningChanged) || (
(
newPermission.isKnownSigner &&
newPermission.knownCerts != oldPermission.knownCerts
) || (