From ca75deb7af290745680e8859a0f8da0770802f6e Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Mon, 20 Jun 2016 18:22:39 +0100
Subject: [PATCH] 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
---
 src/com/android/settings/vpn2/ConfigDialog.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/vpn2/ConfigDialog.java b/src/com/android/settings/vpn2/ConfigDialog.java
index 92050e92fbb..dd63d13f413 100644
--- a/src/com/android/settings/vpn2/ConfigDialog.java
+++ b/src/com/android/settings/vpn2/ConfigDialog.java
@@ -316,12 +316,12 @@ class ConfigDialog extends AlertDialog implements TextWatcher,
     }
 
     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)) {