Merge "Mark system exemption appops as disableReset(true)" (34880984) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+14 −6

Original line number	Diff line number	Diff line
		@@ -2077,6 +2077,8 @@ public class AppOpsManager {
		/**
		* Prevent an app from being placed into hibernation.
		*
		* Only to be used by the system.
		*
		* @hide
		*/
		@SystemApi
		@@ -2086,6 +2088,8 @@ public class AppOpsManager {
		/**
		* Prevent an app from being suspended.
		*
		* Only to be used by the system.
		*
		* @hide
		*/
		public static final String OPSTR_SYSTEM_EXEMPT_FROM_SUSPENSION =
		@@ -2583,7 +2587,8 @@ public class AppOpsManager {
		"SYSTEM_EXEMPT_FROM_APP_STANDBY").build(),
		new AppOpInfo.Builder(OP_SYSTEM_EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS,
		OPSTR_SYSTEM_EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS,
		"SYSTEM_EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS").build(),
		"SYSTEM_EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS")
		.setDisableReset(true).build(),
		new AppOpInfo.Builder(OP_READ_WRITE_HEALTH_DATA, OPSTR_READ_WRITE_HEALTH_DATA,
		"READ_WRITE_HEALTH_DATA").setDefaultMode(AppOpsManager.MODE_ALLOWED).build(),
		new AppOpInfo.Builder(OP_FOREGROUND_SERVICE_SPECIAL_USE,
		@@ -2591,7 +2596,8 @@ public class AppOpsManager {
		.setPermission(Manifest.permission.FOREGROUND_SERVICE_SPECIAL_USE).build(),
		new AppOpInfo.Builder(OP_SYSTEM_EXEMPT_FROM_POWER_RESTRICTIONS,
		OPSTR_SYSTEM_EXEMPT_FROM_POWER_RESTRICTIONS,
		"SYSTEM_EXEMPT_FROM_POWER_RESTRICTIONS").build(),
		"SYSTEM_EXEMPT_FROM_POWER_RESTRICTIONS")
		.setDisableReset(true).build(),
		new AppOpInfo.Builder(
		OP_SYSTEM_EXEMPT_FROM_FGS_BG_START_WHILE_IN_USE_PERMISSION_RESTRICTION,
		OPSTR_SYSTEM_EXEMPT_FROM_FGS_BG_START_WHILE_IN_USE_PERMISSION_RESTRICTION,
		@@ -2599,7 +2605,8 @@ public class AppOpsManager {
		.build(),
		new AppOpInfo.Builder(OP_SYSTEM_EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION,
		OPSTR_SYSTEM_EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION,
		"SYSTEM_EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION").build(),
		"SYSTEM_EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION")
		.setDisableReset(true).build(),
		new AppOpInfo.Builder(
		OP_CAPTURE_CONSENTLESS_BUGREPORT_ON_USERDEBUG_BUILD,
		OPSTR_CAPTURE_CONSENTLESS_BUGREPORT_ON_USERDEBUG_BUILD,
		@@ -2616,7 +2623,8 @@ public class AppOpsManager {
		.build(),
		new AppOpInfo.Builder(OP_SYSTEM_EXEMPT_FROM_HIBERNATION,
		OPSTR_SYSTEM_EXEMPT_FROM_HIBERNATION,
		"SYSTEM_EXEMPT_FROM_HIBERNATION").build(),
		"SYSTEM_EXEMPT_FROM_HIBERNATION")
		.setDisableReset(true).build(),
		new AppOpInfo.Builder(OP_SYSTEM_EXEMPT_FROM_SUSPENSION,
		OPSTR_SYSTEM_EXEMPT_FROM_SUSPENSION,
		"SYSTEM_EXEMPT_FROM_SUSPENSION")