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

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

Browse Source 
am: 73455096d7

Change-Id: Idb17fffd05797c2c54bd823f2bcd6743b2d640fc
This commit is contained in:
Robin Lee
2017-03-30 18:03:56 +00:00
committed by android-build-merger
parent ab315ddb4b 73455096d7
commit a0e34f020a
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;
} }