commit 73455096d76a9a55d8b0ea8c4eb85c1cfaea3dad
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 30 17:57:15 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 30 17:57:16 2017 +0000
tree 40188349f152a51f5713b7e8a427e5410e4730e1
parent dd0e0b45068327aeb34fdb27a0b243db41c5f982
parent b8b310df1797cace05fee4b7ac9b882484f51d25

Merge "VPN: uncheck lockdown if always-on is off" into oc-dev

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

diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index 7559512..9981b2f 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java
@@ -197,9 +197,7 @@
 
     @Override
     public void onConfirmLockdown(Bundle options, boolean isEnabled, boolean isLockdown) {
-        if (setAlwaysOnVpnByUI(isEnabled, isLockdown)) {
-            updateUI();
-        }
+        setAlwaysOnVpnByUI(isEnabled, isLockdown);
     }
 
     private boolean setAlwaysOnVpnByUI(boolean isEnabled, boolean isLockdown) {
@@ -214,6 +212,8 @@
         final boolean success = setAlwaysOnVpn(isEnabled, isLockdown);
         if (isEnabled && (!success || !isVpnAlwaysOn())) {
             CannotConnectFragment.show(this, mVpnLabel);
+        } else {
+            updateUI();
         }
         return success;
     }