commit 1a69570fe8f2ed2ee541d13716f359b1116105e0
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 17 13:07:20 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 17 13:07:21 2017 +0000
tree 1997377171efbee3fefc193241a54753bdf7fb08
parent 5e2a2ee39e4837169ee0d91ccb9481020896959e
parent 2f73d551490afe95a86a088d64c39e0bdf783b54

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

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 6266a39..fe0c17a 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3661,7 +3661,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) {