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 am: b4b83c82cd

Browse Source 
am: 65373db594

Change-Id: I5e0faee7a0b1c6bdfafe77560a91e999f40edc4a
This commit is contained in:
sj.cha
2017-02-17 13:27:04 +00:00
committed by android-build-merger
parent a8bb0c7fdd 65373db594
commit 9b75c75197
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) {