joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Switch over to updated VPN warning strings" into mnc-dev

Browse source
This commit is contained in:
Robin Lee 2015-06-09 23:13:35 +00:00 • committed by Android (Google) Code Review
commit 87a4c8693d
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
services/core/java/com/android/server/ConnectivityService.java
View file

@ -2994,7 +2994,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
throwIfLockdownEnabled();
synchronized(mVpns) {
return mVpns.get(userId).prepare(oldPackage, newPackage);
Vpn vpn = mVpns.get(userId);
if (vpn != null) {
return vpn.prepare(oldPackage, newPackage);
} else {
return false;
}
}
}
@ -3016,7 +3021,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
enforceCrossUserPermission(userId);
synchronized(mVpns) {
mVpns.get(userId).setPackageAuthorization(packageName, authorized);
Vpn vpn = mVpns.get(userId);
if (vpn != null) {
vpn.setPackageAuthorization(packageName, authorized);
}
}
}
@ -3127,7 +3135,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
public VpnConfig getVpnConfig(int userId) {
enforceCrossUserPermission(userId);
synchronized(mVpns) {
return mVpns.get(userId).getVpnConfig();
Vpn vpn = mVpns.get(userId);
if (vpn != null) {
return vpn.getVpnConfig();
} else {
return null;
}
}
}