Merge "AppOps: Add nfc enable control into AppOps" (3aa3e9d2) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,9 @@ public class AppOpsManager {
		/** @hide */
		public static final int OP_BOOT_COMPLETED = 49;
		/** @hide */
		public static final int _NUM_OP = 50;
		public static final int OP_NFC_CHANGE = 50;
		/** @hide */
		public static final int _NUM_OP = 51;

		/** Access to coarse location information. */
		public static final String OPSTR_COARSE_LOCATION =
		@@ -283,6 +285,7 @@ public class AppOpsManager {
		OP_READ_MMS,
		OP_WRITE_MMS,
		OP_BOOT_COMPLETED,
		OP_NFC_CHANGE,
		};

		/**
		@@ -340,6 +343,7 @@ public class AppOpsManager {
		null,
		null,
		null,
		null,
		};

		/**
		@@ -397,6 +401,7 @@ public class AppOpsManager {
		"READ_MMS",
		"WRITE_MMS",
		"BOOT_COMPLETED",
		"NFC_CHANGE",
		};

		/**
		@@ -454,6 +459,7 @@ public class AppOpsManager {
		android.Manifest.permission.READ_SMS,
		android.Manifest.permission.WRITE_SMS,
		android.Manifest.permission.RECEIVE_BOOT_COMPLETED,
		android.Manifest.permission.NFC,
		};

		/**
		@@ -510,6 +516,7 @@ public class AppOpsManager {
		AppOpsManager.MODE_ALLOWED, // OP_READ_MMS
		AppOpsManager.MODE_ALLOWED, // OP_WRITE_MMS
		AppOpsManager.MODE_ALLOWED, // OP_BOOT_COMPLETED
		AppOpsManager.MODE_ALLOWED, // OP_NFC_CHANGE
		};

		/**
		@@ -566,6 +573,7 @@ public class AppOpsManager {
		AppOpsManager.MODE_ASK, // OP_READ_MMS
		AppOpsManager.MODE_ASK, // OP_WRITE_MMS
		AppOpsManager.MODE_ALLOWED, // OP_BOOT_COMPLETED
		AppOpsManager.MODE_ASK, // OP_NFC_CHANGE
		};


		@@ -627,6 +635,7 @@ public class AppOpsManager {
		false,
		false,
		false,
		false,
		};

		private static HashMap<String, Integer> sOpStrToOp = new HashMap<String, Integer>();