Merge "Set ACCESS_RESTRICTED_SETTINGS op to MODE_ALLOWED on package level... (5f8a0c6a) · Commits · e / os / android_frameworks_base

services/permission/java/com/android/server/permission/access/appop/AppIdAppOpUpgrade.kt

+3 −19

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ class AppIdAppOpUpgrade(private val policy: AppIdAppOpPolicy) {
		packageState.appId,
		userId,
		AppOpsManager.OPSTR_RUN_ANY_IN_BACKGROUND,
		appOpMode
		appOpMode,
		)
		}
		}
		@@ -46,7 +46,7 @@ class AppIdAppOpUpgrade(private val policy: AppIdAppOpPolicy) {
		getAppOpMode(
		packageState.appId,
		userId,
		AppOpsManager.OPSTR_SCHEDULE_EXACT_ALARM
		AppOpsManager.OPSTR_SCHEDULE_EXACT_ALARM,
		)
		val defaultAppOpMode =
		AppOpsManager.opToDefaultMode(AppOpsManager.OP_SCHEDULE_EXACT_ALARM)
		@@ -55,23 +55,6 @@ class AppIdAppOpUpgrade(private val policy: AppIdAppOpPolicy) {
		packageState.appId,
		userId,
		AppOpsManager.OPSTR_SCHEDULE_EXACT_ALARM,
		AppOpsManager.MODE_ALLOWED
		)
		}
		}
		}
		}
		if (version <= 15) {
		with(policy) {
		val appOpModes = getAppOpModes(packageState.appId, userId)
		if (
		appOpModes != null &&
		AppOpsManager.OPSTR_ACCESS_RESTRICTED_SETTINGS !in appOpModes
		) {
		setAppOpMode(
		packageState.appId,
		userId,
		AppOpsManager.OPSTR_ACCESS_RESTRICTED_SETTINGS,
		AppOpsManager.MODE_ALLOWED,
		)
		}
		@@ -79,3 +62,4 @@ class AppIdAppOpUpgrade(private val policy: AppIdAppOpPolicy) {
		}
		}
		}
		}

+18 −2

Original line number	Diff line number	Diff line
		@@ -32,15 +32,31 @@ class PackageAppOpUpgrade(private val policy: PackageAppOpPolicy) {
		getAppOpMode(
		packageState.packageName,
		userId,
		AppOpsManager.OPSTR_RUN_IN_BACKGROUND
		AppOpsManager.OPSTR_RUN_IN_BACKGROUND,
		)
		setAppOpMode(
		packageState.packageName,
		userId,
		AppOpsManager.OPSTR_RUN_ANY_IN_BACKGROUND,
		appOpMode
		appOpMode,
		)
		}
		}
		if (version <= 15) {
		with(policy) {
		val appOpModes = getAppOpModes(packageState.packageName, userId)
		if (
		appOpModes != null &&
		AppOpsManager.OPSTR_ACCESS_RESTRICTED_SETTINGS !in appOpModes
		) {
		setAppOpMode(
		packageState.packageName,
		userId,
		AppOpsManager.OPSTR_ACCESS_RESTRICTED_SETTINGS,
		AppOpsManager.MODE_ALLOWED,
		)
		}
		}
		}
		}
		}