diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-04-30 18:02:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 18:02:55 +0000 |
| commit | 729d0a06eaaa40f5be4d9dc5bd580f525ba8360e (patch) | |
| tree | 846ab6c616747cb2ed6c69285b14f63a1bd76b3b | |
| parent | c27b3fca8258c3d7c27b42b4f6978d91f09dcb52 (diff) | |
| parent | c656e6fba6c804b26a4453698808b3029c670244 (diff) | |
| download | frameworks_base-729d0a06eaaa40f5be4d9dc5bd580f525ba8360e.zip frameworks_base-729d0a06eaaa40f5be4d9dc5bd580f525ba8360e.tar.gz frameworks_base-729d0a06eaaa40f5be4d9dc5bd580f525ba8360e.tar.bz2 | |
Merge "Add process outgoing calls app op - framework" into mnc-dev
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index fbe3c6a..75f987f 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -219,8 +219,10 @@ public class AppOpsManager { public static final int OP_ADD_VOICEMAIL = 52; /** @hide Access APIs for SIP calling over VOIP or WiFi. */ public static final int OP_USE_SIP = 53; + /** @hide Intercept outgoing calls. */ + public static final int OP_PROCESS_OUTGOING_CALLS = 54; /** @hide */ - public static final int _NUM_OP = 54; + public static final int _NUM_OP = 55; /** Access to coarse location information. */ public static final String OPSTR_COARSE_LOCATION = "android:coarse_location"; @@ -354,7 +356,8 @@ public class AppOpsManager { OP_ASSIST_SCREENSHOT, OP_READ_PHONE_STATE, OP_ADD_VOICEMAIL, - OP_USE_SIP + OP_USE_SIP, + OP_PROCESS_OUTGOING_CALLS }; /** @@ -415,6 +418,7 @@ public class AppOpsManager { null, null, null, + null, null }; @@ -476,7 +480,8 @@ public class AppOpsManager { "ASSIST_SCREENSHOT", "OP_READ_PHONE_STATE", "ADD_VOICEMAIL", - "USE_SIP" + "USE_SIP", + "PROCESS_OUTGOING_CALLS" }; /** @@ -537,7 +542,8 @@ public class AppOpsManager { null, // no permission for receiving assist screenshot Manifest.permission.READ_PHONE_STATE, Manifest.permission.ADD_VOICEMAIL, - Manifest.permission.USE_SIP + Manifest.permission.USE_SIP, + Manifest.permission.PROCESS_OUTGOING_CALLS }; /** @@ -599,7 +605,8 @@ public class AppOpsManager { null, // ASSIST_SCREENSHOT null, // READ_PHONE_STATE null, // ADD_VOICEMAIL - null // USE_SIP + null, // USE_SIP + null // PROCESS_OUTGOING_CALLS }; /** @@ -660,7 +667,8 @@ public class AppOpsManager { false, //ASSIST_SCREENSHOT false, //READ_PHONE_STATE false, //ADD_VOICEMAIL - false // USE_SIP + false, // USE_SIP + false // PROCESS_OUTGOING_CALLS }; /** @@ -720,6 +728,7 @@ public class AppOpsManager { AppOpsManager.MODE_ALLOWED, AppOpsManager.MODE_ALLOWED, AppOpsManager.MODE_ALLOWED, + AppOpsManager.MODE_ALLOWED, AppOpsManager.MODE_ALLOWED }; @@ -784,6 +793,7 @@ public class AppOpsManager { false, false, false, + false, false }; |