commit 716fa18dcb00d78d98850c3eb0ce3f2963b3ce13
author Paul Jensen <pauljensen@google.com> Mon Jun 06 11:08:44 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 06 11:08:45 2016 +0000
tree 99682cc02fe164a38948911488e9c99de57ea192
parent a81567b7460049185e841b2d741c3437a43a6e73
parent 5912c7b3500f641dc6de7c36e860e6df212769b6

Merge "Include network name in validation logs for dumpsys" into nyc-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 d4f8cb2..6a0d488 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -5214,6 +5214,15 @@
         }
 
         if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {
+            // Remove always-on package
+            synchronized (mVpns) {
+                final String alwaysOnPackage = getAlwaysOnVpnPackage(userId);
+                if (alwaysOnPackage != null) {
+                    setAlwaysOnVpnPackage(userId, null, false);
+                    setVpnPackageAuthorization(alwaysOnPackage, userId, false);
+                }
+            }
+
             // Turn VPN off
             VpnConfig vpnConfig = getVpnConfig(userId);
             if (vpnConfig != null) {
@@ -5224,7 +5233,7 @@
                     // in the future without user intervention.
                     setVpnPackageAuthorization(vpnConfig.user, userId, false);
 
-                    prepareVpn(vpnConfig.user, VpnConfig.LEGACY_VPN, userId);
+                    prepareVpn(null, VpnConfig.LEGACY_VPN, userId);
                 }
             }
         }