diff options
| author | 2015-04-30 18:01:50 +0000 | |
|---|---|---|
| committer | 2015-04-30 18:01:51 +0000 | |
| commit | c27b3fca8258c3d7c27b42b4f6978d91f09dcb52 (patch) | |
| tree | 88d5ff1d786fdf71737fe2f94c601d2ef1ff3ede | |
| parent | fcda22b1fe33370922a53d6562aa15366818bd45 (diff) | |
| parent | 5335b6793cb8cb57c6b034c57bac23ebc599179d (diff) | |
Merge "Add SIP 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 1127436d53f9..fbe3c6af7ab0 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -217,8 +217,10 @@ public class AppOpsManager { public static final int OP_READ_PHONE_STATE = 51; /** @hide Add voicemail messages to the voicemail content provider. */ 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 */ - public static final int _NUM_OP = 53; + public static final int _NUM_OP = 54; /** Access to coarse location information. */ public static final String OPSTR_COARSE_LOCATION = "android:coarse_location"; @@ -351,7 +353,8 @@ public class AppOpsManager { OP_ASSIST_STRUCTURE, OP_ASSIST_SCREENSHOT, OP_READ_PHONE_STATE, - OP_ADD_VOICEMAIL + OP_ADD_VOICEMAIL, + OP_USE_SIP }; /** @@ -411,6 +414,7 @@ public class AppOpsManager { null, null, null, + null, null }; @@ -471,7 +475,8 @@ public class AppOpsManager { "ASSIST_STRUCTURE", "ASSIST_SCREENSHOT", "OP_READ_PHONE_STATE", - "ADD_VOICEMAIL" + "ADD_VOICEMAIL", + "USE_SIP" }; /** @@ -531,7 +536,8 @@ public class AppOpsManager { null, // no permission for receiving assist structure null, // no permission for receiving assist screenshot Manifest.permission.READ_PHONE_STATE, - Manifest.permission.ADD_VOICEMAIL + Manifest.permission.ADD_VOICEMAIL, + Manifest.permission.USE_SIP }; /** @@ -592,7 +598,8 @@ public class AppOpsManager { null, // ASSIST_STRUCTURE null, // ASSIST_SCREENSHOT null, // READ_PHONE_STATE - null // ADD_VOICEMAIL + null, // ADD_VOICEMAIL + null // USE_SIP }; /** @@ -652,7 +659,8 @@ public class AppOpsManager { false, //ASSIST_STRUCTURE false, //ASSIST_SCREENSHOT false, //READ_PHONE_STATE - false //ADD_VOICEMAIL + false, //ADD_VOICEMAIL + false // USE_SIP }; /** @@ -711,6 +719,7 @@ public class AppOpsManager { AppOpsManager.MODE_ALLOWED, AppOpsManager.MODE_ALLOWED, AppOpsManager.MODE_ALLOWED, + AppOpsManager.MODE_ALLOWED, AppOpsManager.MODE_ALLOWED }; @@ -774,6 +783,7 @@ public class AppOpsManager { false, false, false, + false, false }; |