Merge "VPN: uncheck lockdown if always-on is off" into oc-dev (73455096) · Commits · e / os / android_packages_apps_Settings

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -197,9 +197,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment

		@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 @@ public class AppManagementFragment extends SettingsPreferenceFragment
		final boolean success = setAlwaysOnVpn(isEnabled, isLockdown);
		if (isEnabled && (!success \|\| !isVpnAlwaysOn())) {
		CannotConnectFragment.show(this, mVpnLabel);
		} else {
		updateUI();
		}
		return success;
		}