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

am c27b3fca: Merge "Add SIP app op - framework." into mnc-dev

Browse Source 
* commit 'c27b3fca8258c3d7c27b42b4f6978d91f09dcb52':
  Add SIP app op - framework.
This commit is contained in:
Svetoslav
2015-04-30 18:05:57 +00:00
committed by Android Git Automerger
parent 5eedef96d9 c27b3fca82
commit 71264fb236
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,8 +217,10 @@ public class AppOpsManager {
public static final int OP_READ_PHONE_STATE = 51; public static final int OP_READ_PHONE_STATE = 51;
/** @hide Add voicemail messages to the voicemail content provider. */ /** @hide Add voicemail messages to the voicemail content provider. */
public static final int OP_ADD_VOICEMAIL = 52; 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 */ /** @hide */
public static final int _NUM_OP = 53; public static final int _NUM_OP = 54;
/** 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";
@@ -351,7 +353,8 @@ public class AppOpsManager {
OP_ASSIST_STRUCTURE, OP_ASSIST_STRUCTURE,
OP_ASSIST_SCREENSHOT, OP_ASSIST_SCREENSHOT,
OP_READ_PHONE_STATE, 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, null,
null,
null null
}; };
@@ -471,7 +475,8 @@ public class AppOpsManager {
"ASSIST_STRUCTURE", "ASSIST_STRUCTURE",
"ASSIST_SCREENSHOT", "ASSIST_SCREENSHOT",
"OP_READ_PHONE_STATE", "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 structure
null, // no permission for receiving assist screenshot null, // no permission for receiving assist screenshot
Manifest.permission.READ_PHONE_STATE, 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_STRUCTURE
null, // ASSIST_SCREENSHOT null, // ASSIST_SCREENSHOT
null, // READ_PHONE_STATE 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_STRUCTURE
false, //ASSIST_SCREENSHOT false, //ASSIST_SCREENSHOT
false, //READ_PHONE_STATE 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, AppOpsManager.MODE_ALLOWED,
AppOpsManager.MODE_ALLOWED,
AppOpsManager.MODE_ALLOWED AppOpsManager.MODE_ALLOWED
}; };
@@ -774,6 +783,7 @@ public class AppOpsManager {
false, false,
false, false,
false, false,
false,
false false
}; };