commit 07127d83a6320f41a0fe5a05608917cc30ea1849
author Robin Lee <rgl@google.com> Mon Jun 20 18:22:39 2016 +0100
committer Robin Lee <rgl@google.com> Thu Jun 30 09:05:58 2016 +0000
tree 66eeba45e432625381367de69214211c7e1874e6
parent ebed4797b15d78785340c2e0159da927a9f28bc5

Don't show always-on option connecting PPTP vpn

Support for this kind has been taken out so it shouldn't be an option
when connecting (it's already not an option when editing).

Bug: 28807474
Change-Id: Id3e7be390c6813d091e7f897ac82aaf29042beb8
(cherry picked from commit ca75deb7af290745680e8859a0f8da0770802f6e)

src/com/android/settings/vpn2/ConfigDialog.java

diff --git a/src/com/android/settings/vpn2/ConfigDialog.java b/src/com/android/settings/vpn2/ConfigDialog.java
index 92050e9..dd63d13 100644
--- a/src/com/android/settings/vpn2/ConfigDialog.java
+++ b/src/com/android/settings/vpn2/ConfigDialog.java
@@ -316,12 +316,12 @@
     }
 
     private boolean validate(boolean editing) {
-        if (!editing) {
-            return mUsername.getText().length() != 0 && mPassword.getText().length() != 0;
-        }
         if (mAlwaysOnVpn.isChecked() && !getProfile().isValidLockdownProfile()) {
             return false;
         }
+        if (!editing) {
+            return mUsername.getText().length() != 0 && mPassword.getText().length() != 0;
+        }
         if (mName.getText().length() == 0 || mServer.getText().length() == 0 ||
                 !validateAddresses(mDnsServers.getText().toString(), false) ||
                 !validateAddresses(mRoutes.getText().toString(), true)) {