diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-05-03 00:44:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-03 00:44:14 +0000 |
| commit | ca030f8ed5fd52f2821d159b9c16d0c514dc0688 (patch) | |
| tree | ef80d77f754fd9cf4440d48a184fc5fec3290d14 | |
| parent | e9fc4cda50664558028b79edd1f4b893cd4f52d3 (diff) | |
| parent | ede431678e5f6ccf9d038479e84ea66da3f821e3 (diff) | |
| download | frameworks_base-ca030f8ed5fd52f2821d159b9c16d0c514dc0688.zip frameworks_base-ca030f8ed5fd52f2821d159b9c16d0c514dc0688.tar.gz frameworks_base-ca030f8ed5fd52f2821d159b9c16d0c514dc0688.tar.bz2 | |
Merge "Add read cell broadcast app op - framework" into mnc-dev
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 6b161b9..6bbbf9e 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -225,8 +225,10 @@ public class AppOpsManager { public static final int OP_USE_FINGERPRINT = 55; /** @hide Access to body sensors such as heart rate, etc. */ public static final int OP_BODY_SENSORS = 56; + /** @hide Read previously received cell broadcast messages. */ + public static final int OP_READ_CELL_BROADCASTS = 57; /** @hide */ - public static final int _NUM_OP = 57; + public static final int _NUM_OP = 58; /** Access to coarse location information. */ public static final String OPSTR_COARSE_LOCATION = "android:coarse_location"; @@ -303,6 +305,9 @@ public class AppOpsManager { /** @hide Access to body sensors such as heart rate, etc. */ public static final String OPSTR_BODY_SENSORS = "android:body_sensors"; + /** @hide Read previously received cell broadcast messages. */ + public static final String OPSTR_READ_CELL_BROADCASTS + = "android:read_cell_broadcasts"; /** * This maps each operation to the operation that serves as the @@ -369,7 +374,8 @@ public class AppOpsManager { OP_USE_SIP, OP_PROCESS_OUTGOING_CALLS, OP_USE_FINGERPRINT, - OP_BODY_SENSORS + OP_BODY_SENSORS, + OP_READ_CELL_BROADCASTS }; /** @@ -433,7 +439,8 @@ public class AppOpsManager { OPSTR_USE_SIP, null, OPSTR_USE_FINGERPRINT, - OPSTR_BODY_SENSORS + OPSTR_BODY_SENSORS, + OPSTR_READ_CELL_BROADCASTS }; /** @@ -497,7 +504,8 @@ public class AppOpsManager { "USE_SIP", "PROCESS_OUTGOING_CALLS", "USE_FINGERPRINT", - "BODY_SENSORS" + "BODY_SENSORS", + "READ_CELL_BROADCASTS" }; /** @@ -561,7 +569,8 @@ public class AppOpsManager { Manifest.permission.USE_SIP, Manifest.permission.PROCESS_OUTGOING_CALLS, Manifest.permission.USE_FINGERPRINT, - Manifest.permission.BODY_SENSORS + Manifest.permission.BODY_SENSORS, + Manifest.permission.READ_CELL_BROADCASTS }; /** @@ -626,7 +635,8 @@ public class AppOpsManager { null, // USE_SIP null, // PROCESS_OUTGOING_CALLS null, // USE_FINGERPRINT - null // BODY_SENSORS + null, // BODY_SENSORS + null // READ_CELL_BROADCASTS }; /** @@ -690,7 +700,8 @@ public class AppOpsManager { false, // USE_SIP false, // PROCESS_OUTGOING_CALLS false, // USE_FINGERPRINT - false // BODY_SENSORS + false, // BODY_SENSORS + false // READ_CELL_BROADCASTS }; /** @@ -753,6 +764,7 @@ public class AppOpsManager { AppOpsManager.MODE_ALLOWED, AppOpsManager.MODE_ALLOWED, AppOpsManager.MODE_ALLOWED, + AppOpsManager.MODE_ALLOWED, AppOpsManager.MODE_ALLOWED }; @@ -820,6 +832,7 @@ public class AppOpsManager { false, false, false, + false, false }; |