Merge "Define an App Op for REQUEST_DELETE_PACKAGES." (ef1a2a4f) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -256,8 +256,10 @@ public class AppOpsManager {
		public static final int OP_RUN_ANY_IN_BACKGROUND = 70;
		/** @hide Change Wi-Fi connectivity state */
		public static final int OP_CHANGE_WIFI_STATE = 71;
		/** @hide Request package deletion through package installer */
		public static final int OP_REQUEST_DELETE_PACKAGES = 72;
		/** @hide */
		public static final int _NUM_OP = 72;
		public static final int _NUM_OP = 73;

		/** Access to coarse location information. */
		public static final String OPSTR_COARSE_LOCATION = "android:coarse_location";
		@@ -410,6 +412,7 @@ public class AppOpsManager {
		OP_CAMERA,
		// Body sensors
		OP_BODY_SENSORS,
		OP_REQUEST_DELETE_PACKAGES,

		// APPOP PERMISSIONS
		OP_ACCESS_NOTIFICATIONS,
		@@ -499,6 +502,7 @@ public class AppOpsManager {
		OP_ANSWER_PHONE_CALLS,
		OP_RUN_ANY_IN_BACKGROUND,
		OP_CHANGE_WIFI_STATE,
		OP_REQUEST_DELETE_PACKAGES,
		};

		/**
		@@ -578,6 +582,7 @@ public class AppOpsManager {
		OPSTR_ANSWER_PHONE_CALLS,
		null, // OP_RUN_ANY_IN_BACKGROUND
		null, // OP_CHANGE_WIFI_STATE
		null, // OP_REQUEST_DELETE_PACKAGES
		};

		/**
		@@ -657,6 +662,7 @@ public class AppOpsManager {
		"ANSWER_PHONE_CALLS",
		"RUN_ANY_IN_BACKGROUND",
		"CHANGE_WIFI_STATE",
		"REQUEST_DELETE_PACKAGES",
		};

		/**
		@@ -736,6 +742,7 @@ public class AppOpsManager {
		Manifest.permission.ANSWER_PHONE_CALLS,
		null, // no permission for OP_RUN_ANY_IN_BACKGROUND
		Manifest.permission.CHANGE_WIFI_STATE,
		Manifest.permission.REQUEST_DELETE_PACKAGES,
		};

		/**
		@@ -816,6 +823,7 @@ public class AppOpsManager {
		null, // ANSWER_PHONE_CALLS
		null, // OP_RUN_ANY_IN_BACKGROUND
		null, // OP_CHANGE_WIFI_STATE
		null, // REQUEST_DELETE_PACKAGES
		};

		/**
		@@ -895,6 +903,7 @@ public class AppOpsManager {
		false, // ANSWER_PHONE_CALLS
		false, // OP_RUN_ANY_IN_BACKGROUND
		false, // OP_CHANGE_WIFI_STATE
		false, // OP_REQUEST_DELETE_PACKAGES
		};

		/**
		@@ -973,6 +982,7 @@ public class AppOpsManager {
		AppOpsManager.MODE_ALLOWED, // ANSWER_PHONE_CALLS
		AppOpsManager.MODE_ALLOWED, // OP_RUN_ANY_IN_BACKGROUND
		AppOpsManager.MODE_ALLOWED, // OP_CHANGE_WIFI_STATE
		AppOpsManager.MODE_ALLOWED, // REQUEST_DELETE_PACKAGES
		};

		/**
		@@ -1055,6 +1065,7 @@ public class AppOpsManager {
		false, // ANSWER_PHONE_CALLS
		false, // OP_RUN_ANY_IN_BACKGROUND
		false, // OP_CHANGE_WIFI_STATE
		false, // OP_REQUEST_DELETE_PACKAGES
		};

		/**