Allow disconnecting always-on VPNs

Bug: 28072644 Change-Id: If7595f7e17747867158368d95db5addf97d3a14c
2016-04-14 15:41:41 +01:00
parent 41dde76a6b
commit b3c4133a71
2 changed files with 8 additions and 10 deletions
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -299,11 +299,6 @@ public class VpnSettings extends RestrictedSettingsFragment implements
            return true;
        } else if (preference instanceof AppPreference) {
            AppPreference pref = (AppPreference) preference;
-            if (pref.isAlwaysOn()) {
-                // User can't disconnect vpn when always-on is enabled
-                return true;
-            }
-
            boolean connected = (pref.getState() == AppPreference.STATE_CONNECTED);

            if (!connected) {