LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev

Browse Source
This commit is contained in:
Jeff Davidson
2014-08-20 23:59:29 +00:00
committed by Android (Google) Code Review
parent b0b5d7eb83 6047c1dc68
commit d89d8ecff8
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/IConnectivityManager.aidl
View File

@@ -108,6 +108,8 @@ interface IConnectivityManager
boolean prepareVpn(String oldPackage, String newPackage); boolean prepareVpn(String oldPackage, String newPackage);
void setVpnPackageAuthorization(boolean authorized);
ParcelFileDescriptor establishVpn(in VpnConfig config); ParcelFileDescriptor establishVpn(in VpnConfig config);
VpnConfig getVpnConfig(); VpnConfig getVpnConfig();

14
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -2662,6 +2662,20 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
} }
/**
* Set whether the current VPN package has the ability to launch VPNs without
* user intervention. This method is used by system UIs and not available
* in ConnectivityManager. Permissions are checked in Vpn class.
* @hide
*/
@Override
public void setVpnPackageAuthorization(boolean authorized) {
int user = UserHandle.getUserId(Binder.getCallingUid());
synchronized(mVpns) {
mVpns.get(user).setPackageAuthorization(authorized);
}
}
/** /**
* Configure a TUN interface and return its file descriptor. Parameters * Configure a TUN interface and return its file descriptor. Parameters
* are encoded and opaque to this class. This method is used by VpnBuilder * are encoded and opaque to this class. This method is used by VpnBuilder