PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VPN: uncheck lockdown if always-on is off

Browse Source 
Change-Id: I00933e0c8567997d800f9f31f78c7b19922a52b8
Fix: 36713605
Test: make RunSettingsRoboTests -j30
This commit is contained in:
Robin Lee
2017-03-30 15:13:07 +01:00
parent a53f8a9128
commit b8b310df17
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/vpn2/AppManagementFragment.java
View File

@@ -197,9 +197,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
@Override @Override
public void onConfirmLockdown(Bundle options, boolean isEnabled, boolean isLockdown) { public void onConfirmLockdown(Bundle options, boolean isEnabled, boolean isLockdown) {
if (setAlwaysOnVpnByUI(isEnabled, isLockdown)) { setAlwaysOnVpnByUI(isEnabled, isLockdown);
updateUI();
}
} }
private boolean setAlwaysOnVpnByUI(boolean isEnabled, boolean isLockdown) { private boolean setAlwaysOnVpnByUI(boolean isEnabled, boolean isLockdown) {
@@ -214,6 +212,8 @@ public class AppManagementFragment extends SettingsPreferenceFragment
final boolean success = setAlwaysOnVpn(isEnabled, isLockdown); final boolean success = setAlwaysOnVpn(isEnabled, isLockdown);
if (isEnabled && (!success || !isVpnAlwaysOn())) { if (isEnabled && (!success || !isVpnAlwaysOn())) {
CannotConnectFragment.show(this, mVpnLabel); CannotConnectFragment.show(this, mVpnLabel);
} else {
updateUI();
} }
return success; return success;
} }