commit 4b03d2d6d536735f10d96ac0b8cf836f8ebf4384
author sj.cha <sj.cha@lge.com> Fri Feb 17 13:32:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 17 13:32:07 2017 +0000
tree f2272c7dd0cc9873d9467ba6d6778694f413aff2
parent e4d934db90fb8ae10179eabcad94f08bd408d1fa
parent 9b75c7519740ac293804412a77362e4711ce4f7f

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

Change-Id: Ib7e586a778c6fb9b920f0790e4b343c122250bb7

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index fe0b840..4bc9bb1 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3664,7 +3664,12 @@
         // Tear down existing lockdown if profile was removed
         mLockdownEnabled = LockdownVpnTracker.isEnabled();
         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(
                     profileName, mKeyStore.get(Credentials.VPN + profileName));
             if (profile == null) {