Merge branch 'cm-11.0' into stable/cm-11.0 (f0765ca5) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+10 −1

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

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

		/**
		@@ -344,6 +347,7 @@ public class AppOpsManager {
		null,
		null,
		null,
		null,
		};

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

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

		/**
		@@ -517,6 +523,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
		};

		/**
		@@ -574,6 +581,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
		};


		@@ -636,6 +644,7 @@ public class AppOpsManager {
		false,
		false,
		false,
		false,
		};

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.app.Activity;
		import android.app.ActivityThread;
		import android.app.AppOpsManager;
		import android.app.OnActivityPausedListener;
		import android.app.PendingIntent;
		import android.content.Context;
		@@ -309,6 +310,7 @@ public final class NfcAdapter {

		final NfcActivityManager mNfcActivityManager;
		final Context mContext;
		private final AppOpsManager mAppOps;

		/**
		* A callback to be invoked when the system finds a tag while the foreground activity is
		@@ -512,6 +514,7 @@ public final class NfcAdapter {
		NfcAdapter(Context context) {
		mContext = context;
		mNfcActivityManager = new NfcActivityManager(this);
		mAppOps = (AppOpsManager)context.getSystemService(Context.APP_OPS_SERVICE);
		}

		/**
		@@ -642,6 +645,9 @@ public final class NfcAdapter {
		* @hide
		*/
		public boolean enable() {
		if (mAppOps.noteOp(AppOpsManager.OP_NFC_CHANGE) != AppOpsManager.MODE_ALLOWED){
		return false;
		}
		try {
		return sService.enable();
		} catch (RemoteException e) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -134,4 +134,5 @@
		<string name="adb_active_generic_notification_message">Raak om ontfouting af te skakel.</string>
		<string name="extmedia_format_message_cm" product="nosdcard">Alle data op jou USB stoor-spasie (onder die pad \'%1$s\') sal uitgevee word. Hierdie aksie kan nie ontdoen word nie!</string>
		<string name="extmedia_format_message_cm" product="default">Alle data op jou kaart (onder die pad \'%1$s\') sal uitgewis word. Hierdie aksie kan nie ontdoen word nie!</string>
		<string name="usb_storage_notification_manage_message">Raak om te bestuur</string>
		</resources>

+1 −0

Original line number	Diff line number	Diff line
		@@ -134,4 +134,5 @@
		<string name="adb_active_generic_notification_message">إللمس لتعطيل التصحيح.</string>
		<string name="extmedia_format_message_cm" product="nosdcard">سيتم مسح كافة البيانات الموجودة على جهاز تخزين USB (في إطار المسار \'%1$s). لا يمكن التراجع عن هذا الإجراء!</string>
		<string name="extmedia_format_message_cm" product="default">سيتم مسح كافة البيانات الموجودة في الذاكرة (في إطار المسار\'%1$s\'). لا يمكن التراجع عن هذا الإجراء!</string>
		<string name="usb_storage_notification_manage_message">اضغط لإدارة الخيارات</string>
		</resources>

+1 −0

Original line number	Diff line number	Diff line
		@@ -134,4 +134,5 @@
		<string name="adb_active_generic_notification_message">Berühren, um Debugging zu deaktivieren.</string>
		<string name="extmedia_format_message_cm" product="nosdcard">Alle auf Ihrem USB-Speicher im Pfad \"%1$s\" abgelegten Dateien werden gelöscht. Diese Aktion kann nicht rückgängig gemacht werden!</string>
		<string name="extmedia_format_message_cm" product="default">Alle auf Ihrer SD-Karte im Pfad \"%1$s\" abgelegten Dateien werden gelöscht. Diese Aktion kann nicht rückgängig gemacht werden!</string>
		<string name="usb_storage_notification_manage_message">Zum Verwalten tippen</string>
		</resources>