Merge "Re-evaluate permission state upon known certs change." (3506548c) · Commits · e / os / android_frameworks_base

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

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -519,10 +519,16 @@ class AppIdPermissionPolicy : SchemePolicy() {
	val isPermissionChanged = oldPermission == null \|\|		val isPermissionChanged = oldPermission == null \|\|
	newPackageName != oldPermission.packageName \|\|		newPackageName != oldPermission.packageName \|\|
	newPermission.protectionLevel != oldPermission.protectionLevel \|\| (		newPermission.protectionLevel != oldPermission.protectionLevel \|\| (
	oldPermission.isReconciled && newPermission.isRuntime &&		oldPermission.isReconciled && (
	newPermission.groupName != null &&		(
			newPermission.isKnownSigner &&
			newPermission.knownCerts != oldPermission.knownCerts
			) \|\| (
			newPermission.isRuntime && newPermission.groupName != null &&
	newPermission.groupName != oldPermission.groupName		newPermission.groupName != oldPermission.groupName
	)		)
			)
			)
	if (isPermissionChanged) {		if (isPermissionChanged) {
	changedPermissionNames += permissionName		changedPermissionNames += permissionName
	}		}