Merge "Retain ROLE and USER_SET for app-op permissions in UPS." (37a1b03b) · Commits · e / os / android_frameworks_base

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -749,12 +749,17 @@ class AppIdPermissionPolicy : SchemePolicy() {
		// If this is an existing, non-system package,
		// then we can't add any new permissions to it.
		// Except if this is a permission that was added to the platform
		val newFlags = if (!wasRevoked \|\| isRequestedByInstalledPackage \|\|
		var newFlags = if (!wasRevoked \|\| isRequestedByInstalledPackage \|\|
		isRequestedBySystemPackage \|\| isCompatibilityPermission) {
		PermissionFlags.INSTALL_GRANTED
		} else {
		PermissionFlags.INSTALL_REVOKED
		}
		if (permission.isAppOp) {
		newFlags = newFlags or (
		oldFlags and (PermissionFlags.ROLE or PermissionFlags.USER_SET)
		)
		}
		setPermissionFlags(appId, userId, permissionName, newFlags)
		}
		} else if (permission.isSignature \|\| permission.isInternal) {
		@@ -784,6 +789,11 @@ class AppIdPermissionPolicy : SchemePolicy() {
		0
		}
		}
		if (permission.isAppOp) {
		newFlags = newFlags or (
		oldFlags and (PermissionFlags.ROLE or PermissionFlags.USER_SET)
		)
		}
		// Different from the old implementation, which seemingly allows granting an
		// unallowlisted privileged permission via development or role but revokes it upon next
		// reconciliation, we now properly allows that because the privileged protection flag