commit d37059e6aa6fbb0733730cb99a0413686a83e241
author Erik Kline <ek@google.com> Wed Oct 14 17:37:57 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 14 17:37:57 2015 +0000
tree 6bc8d87c588d0d65120fab7af55523cb6fd2feac
parent 114f3fe265c742a83fc97174ff8501693bb92ff3
parent 60f1e8cbb495704345d11dbf348f05e9191bc5d0

Merge "Don't crash if an invalid always-on VPN profile is configured." into mnc-dr-dev

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 77837b7..4c03143 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3212,6 +3212,11 @@
             final String profileName = new String(mKeyStore.get(Credentials.LOCKDOWN_VPN));
             final VpnProfile profile = VpnProfile.decode(
                     profileName, mKeyStore.get(Credentials.VPN + profileName));
+            if (profile == null) {
+                Slog.e(TAG, "Lockdown VPN configured invalid profile " + profileName);
+                setLockdownTracker(null);
+                return true;
+            }
             int user = UserHandle.getUserId(Binder.getCallingUid());
             synchronized(mVpns) {
                 setLockdownTracker(new LockdownVpnTracker(mContext, mNetd, this, mVpns.get(user),