Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev

Browse Source 
* commit 'ca030f8ed5fd52f2821d159b9c16d0c514dc0688':
  Add read cell broadcast app op - framework
This commit is contained in:
Svet Ganov
2015-05-03 00:50:34 +00:00
committed by Android Git Automerger
parent 0f74977b5c ca030f8ed5
commit 6a67cd4504
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/java/android/app/AppOpsManager.java
View File

@@ -225,8 +225,10 @@ public class AppOpsManager {
public static final int OP_USE_FINGERPRINT = 55; public static final int OP_USE_FINGERPRINT = 55;
/** @hide Access to body sensors such as heart rate, etc. */ /** @hide Access to body sensors such as heart rate, etc. */
public static final int OP_BODY_SENSORS = 56; 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 */ /** @hide */
public static final int _NUM_OP = 57; public static final int _NUM_OP = 58;
/** Access to coarse location information. */ /** Access to coarse location information. */
public static final String OPSTR_COARSE_LOCATION = "android:coarse_location"; 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. */ /** @hide Access to body sensors such as heart rate, etc. */
public static final String OPSTR_BODY_SENSORS public static final String OPSTR_BODY_SENSORS
= "android: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 * This maps each operation to the operation that serves as the
@@ -369,7 +374,8 @@ public class AppOpsManager {
OP_USE_SIP, OP_USE_SIP,
OP_PROCESS_OUTGOING_CALLS, OP_PROCESS_OUTGOING_CALLS,
OP_USE_FINGERPRINT, OP_USE_FINGERPRINT,
OP_BODY_SENSORS OP_BODY_SENSORS,
OP_READ_CELL_BROADCASTS
}; };
/** /**
@@ -433,7 +439,8 @@ public class AppOpsManager {
OPSTR_USE_SIP, OPSTR_USE_SIP,
null, null,
OPSTR_USE_FINGERPRINT, OPSTR_USE_FINGERPRINT,
OPSTR_BODY_SENSORS OPSTR_BODY_SENSORS,
OPSTR_READ_CELL_BROADCASTS
}; };
/** /**
@@ -497,7 +504,8 @@ public class AppOpsManager {
"USE_SIP", "USE_SIP",
"PROCESS_OUTGOING_CALLS", "PROCESS_OUTGOING_CALLS",
"USE_FINGERPRINT", "USE_FINGERPRINT",
"BODY_SENSORS" "BODY_SENSORS",
"READ_CELL_BROADCASTS"
}; };
/** /**
@@ -561,7 +569,8 @@ public class AppOpsManager {
Manifest.permission.USE_SIP, Manifest.permission.USE_SIP,
Manifest.permission.PROCESS_OUTGOING_CALLS, Manifest.permission.PROCESS_OUTGOING_CALLS,
Manifest.permission.USE_FINGERPRINT, 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, // USE_SIP
null, // PROCESS_OUTGOING_CALLS null, // PROCESS_OUTGOING_CALLS
null, // USE_FINGERPRINT null, // USE_FINGERPRINT
null // BODY_SENSORS null, // BODY_SENSORS
null // READ_CELL_BROADCASTS
}; };
/** /**
@@ -690,7 +700,8 @@ public class AppOpsManager {
false, // USE_SIP false, // USE_SIP
false, // PROCESS_OUTGOING_CALLS false, // PROCESS_OUTGOING_CALLS
false, // USE_FINGERPRINT 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, AppOpsManager.MODE_ALLOWED,
AppOpsManager.MODE_ALLOWED,
AppOpsManager.MODE_ALLOWED AppOpsManager.MODE_ALLOWED
}; };
@@ -820,6 +832,7 @@ public class AppOpsManager {
false, false,
false, false,
false, false,
false,
false false
}; };