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

Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 63ca8979e4

Browse Source 
am: b4b83c82cd

Change-Id: I82c297e654af6690c6a3be216a0da08a3aff5b9d
This commit is contained in:
sj.cha
2017-02-17 13:21:34 +00:00
committed by android-build-merger
parent 6e3ea85738 b4b83c82cd
commit 65373db594
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3661,7 +3661,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
// Tear down existing lockdown if profile was removed // Tear down existing lockdown if profile was removed
mLockdownEnabled = LockdownVpnTracker.isEnabled(); mLockdownEnabled = LockdownVpnTracker.isEnabled();
if (mLockdownEnabled) { if (mLockdownEnabled) {
final String profileName = new String(mKeyStore.get(Credentials.LOCKDOWN_VPN)); byte[] profileTag = mKeyStore.get(Credentials.LOCKDOWN_VPN);
if (profileTag == null) {
Slog.e(TAG, "Lockdown VPN configured but cannot be read from keystore");
return false;
}
String profileName = new String(profileTag);
final VpnProfile profile = VpnProfile.decode( final VpnProfile profile = VpnProfile.decode(
profileName, mKeyStore.get(Credentials.VPN + profileName)); profileName, mKeyStore.get(Credentials.VPN + profileName));
if (profile == null) { if (profile == null) {