summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/IConnectivityManager.aidl
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2015-05-12 18:14:58 +0100
committerRobin Lee <rgl@google.com>2015-05-18 23:35:31 +0100
commit3b3dd942ec6a0beaccd1cef0723d72786435d8f3 (patch)
tree6bf3cc9895290fa3ec9a509fb87d30afb649697e /core/java/android/net/IConnectivityManager.aidl
parent0125d76fa37d26a29f06371ff349546e21cd3f4d (diff)
downloadframeworks_base-3b3dd942ec6a0beaccd1cef0723d72786435d8f3.zip
frameworks_base-3b3dd942ec6a0beaccd1cef0723d72786435d8f3.tar.gz
frameworks_base-3b3dd942ec6a0beaccd1cef0723d72786435d8f3.tar.bz2
Support cross-user VPN calls (with permission)
Settings and SystemUI need to act on other users than USER_OWNER. This is gated by INTERACT_ACROSS_USERS_FULL in addition to the existing CONTROL_VPN checks, so the number of processes able to interfere with other profiles' VPNs should be quite small. Bug: 20692490 Bug: 20747154 Bug: 20872408 Change-Id: I6e5d7220f73435bec350719e7b4715935caf4e19
Diffstat (limited to 'core/java/android/net/IConnectivityManager.aidl')
-rw-r--r--core/java/android/net/IConnectivityManager.aidl6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl
index 77200a5..c1b4a1f 100644
--- a/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@ -106,13 +106,13 @@ interface IConnectivityManager
ProxyInfo getDefaultProxy();
- boolean prepareVpn(String oldPackage, String newPackage);
+ boolean prepareVpn(String oldPackage, String newPackage, int userId);
- void setVpnPackageAuthorization(boolean authorized);
+ void setVpnPackageAuthorization(String packageName, int userId, boolean authorized);
ParcelFileDescriptor establishVpn(in VpnConfig config);
- VpnConfig getVpnConfig();
+ VpnConfig getVpnConfig(int userId);
void startLegacyVpn(in VpnProfile profile);