Merge "Keep legacy permission granted if it has been reviewed." (6353e05d) · Commits · e / os / android_frameworks_base

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -831,7 +831,13 @@ class AppIdPermissionPolicy : SchemePolicy() {
		}
		} else {
		val wasGrantedByLegacy = newFlags.hasBits(PermissionFlags.LEGACY_GRANTED)
		val hasImplicitFlag = newFlags.hasBits(PermissionFlags.IMPLICIT)
		if (wasGrantedByLegacy) {
		newFlags = newFlags andInv PermissionFlags.LEGACY_GRANTED
		if (!hasImplicitFlag) {
		newFlags = newFlags or PermissionFlags.RUNTIME_GRANTED
		}
		}
		val wasGrantedByImplicit = newFlags.hasBits(PermissionFlags.IMPLICIT_GRANTED)
		val isLeanbackNotificationsPermission = newState.externalState.isLeanback &&
		permissionName in NOTIFICATIONS_PERMISSIONS
		@@ -870,7 +876,6 @@ class AppIdPermissionPolicy : SchemePolicy() {
		)
		}
		}
		val hasImplicitFlag = newFlags.hasBits(PermissionFlags.IMPLICIT)
		if (!isImplicitPermission && hasImplicitFlag) {
		newFlags = newFlags andInv PermissionFlags.IMPLICIT
		var shouldRetainAsNearbyDevices = false