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 "Disable always-on VPN in factoryReset"

Browse source 
am: 5765604627

Change-Id: I021b288e3db17ddefbea3645fd282e3ee123a6e8
This commit is contained in:
Robin Lee 2017-01-23 16:47:58 +00:00 • committed by android-build-merger
commit 7960c6b8b5
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5464,6 +5464,18 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
}
// Turn Always-on VPN off
if (mLockdownEnabled && userId == UserHandle.USER_SYSTEM) {
final long ident = Binder.clearCallingIdentity();
try {
mKeyStore.delete(Credentials.LOCKDOWN_VPN);
mLockdownEnabled = false;
setLockdownTracker(null);
} finally {
Binder.restoreCallingIdentity(ident);
}
}
// Turn VPN off
VpnConfig vpnConfig = getVpnConfig(userId);
if (vpnConfig != null) {