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

Merge \"Fix always-on is not turned off when user forgets vpn\" into nyc-mr1-dev

Browse Source 
am: 9505b78e29

Change-Id: I60148caf5e9bd37ae2c0460e6c8a8d6aacf478aa
This commit is contained in:
Victor Chang
2016-07-11 14:08:09 +00:00
committed by android-build-merger
parent b209123dca 9505b78e29
commit d308bbc358
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
public void onForget() { public void onForget() {
// Unset always-on-vpn when forgetting the VPN // Unset always-on-vpn when forgetting the VPN
if (isVpnAlwaysOn()) { if (isVpnAlwaysOn()) {
setAlwaysOnVpnByUI(false); setAlwaysOnVpn(false);
} }
// Also dismiss and go back to VPN list // Also dismiss and go back to VPN list
finish(); finish();
@@ -187,14 +187,18 @@ public class AppManagementFragment extends SettingsPreferenceFragment
if (mUserId == UserHandle.USER_SYSTEM) { if (mUserId == UserHandle.USER_SYSTEM) {
VpnUtils.clearLockdownVpn(getContext()); VpnUtils.clearLockdownVpn(getContext());
} }
final boolean success = mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId, final boolean success = setAlwaysOnVpn(isEnabled);
isEnabled ? mPackageName : null, /* lockdownEnabled */ false);
if (isEnabled && (!success || !isVpnAlwaysOn())) { if (isEnabled && (!success || !isVpnAlwaysOn())) {
CannotConnectFragment.show(this, mVpnLabel); CannotConnectFragment.show(this, mVpnLabel);
} }
return success; return success;
} }
private boolean setAlwaysOnVpn(boolean isEnabled) {
return mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId,
isEnabled ? mPackageName : null, /* lockdownEnabled */ false);
}
private boolean checkTargetVersion() { private boolean checkTargetVersion() {
if (mPackageInfo == null || mPackageInfo.applicationInfo == null) { if (mPackageInfo == null || mPackageInfo.applicationInfo == null) {
return true; return true;