Merge "Skip lockdown setup if user is not up yet" into nyc-dev

2016-03-14 13:19:55 +00:00
parent ec09996b59 18566c1bae
commit d646b3d67f
1 changed files with 6 additions and 2 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3253,8 +3253,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
            }
            int user = UserHandle.getUserId(Binder.getCallingUid());
            synchronized(mVpns) {
-                setLockdownTracker(new LockdownVpnTracker(mContext, mNetd, this, mVpns.get(user),
-                            profile));
+                Vpn vpn = mVpns.get(user);
+                if (vpn == null) {
+                    Slog.w(TAG, "VPN for user " + user + " not ready yet. Skipping lockdown");
+                    return false;
+                }
+                setLockdownTracker(new LockdownVpnTracker(mContext, mNetd, this, vpn, profile));
            }
        } else {
            setLockdownTracker(null);