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

Add lockdownEnabled parameter to always-on VPN API

Browse Source 
Allows callers to opt-out of blockading network traffic during boot and
on VPN app failure.

Bug: 26694104
Change-Id: Ic2c25b79d8a17917025eb37be7de929fe156e2a3
This commit is contained in:
Robin Lee
2016-05-03 13:27:05 +01:00
parent e69d754865
commit cdebe28c15
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/vpn2/AppDialogFragment.java
View File

@@ -138,7 +138,7 @@ public class AppDialogFragment extends DialogFragment implements AppDialog.Liste
final int userId = UserHandle.getUserId(mPackageInfo.applicationInfo.uid); final int userId = UserHandle.getUserId(mPackageInfo.applicationInfo.uid);
try { try {
if (mPackageInfo.packageName.equals(getConnectedPackage(mService, userId))) { if (mPackageInfo.packageName.equals(getConnectedPackage(mService, userId))) {
mService.setAlwaysOnVpnPackage(userId, null); mService.setAlwaysOnVpnPackage(userId, null, /* lockdownEnabled */ false);
mService.prepareVpn(mPackageInfo.packageName, VpnConfig.LEGACY_VPN, userId); mService.prepareVpn(mPackageInfo.packageName, VpnConfig.LEGACY_VPN, userId);
} }
} catch (RemoteException e) { } catch (RemoteException e) {

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

@@ -176,7 +176,8 @@ public class AppManagementFragment extends SettingsPreferenceFragment
if (mUserId == UserHandle.USER_SYSTEM) { if (mUserId == UserHandle.USER_SYSTEM) {
VpnUtils.clearLockdownVpn(getContext()); VpnUtils.clearLockdownVpn(getContext());
} }
mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId, isEnabled ? mPackageName : null); mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId, isEnabled ? mPackageName : null,
/* lockdownEnabled */ false);
if (isEnabled && !isVpnAlwaysOn()) { if (isEnabled && !isVpnAlwaysOn()) {
CannotConnectFragment.show(this, mVpnLabel); CannotConnectFragment.show(this, mVpnLabel);
} }

3
src/com/android/settings/vpn2/ConfigDialogFragment.java
View File

@@ -153,7 +153,8 @@ public class ConfigDialogFragment extends DialogFragment implements
} }
final ConnectivityManager conn = ConnectivityManager.from(getActivity()); final ConnectivityManager conn = ConnectivityManager.from(getActivity());
conn.setAlwaysOnVpnPackageForUser(UserHandle.myUserId(), null); conn.setAlwaysOnVpnPackageForUser(UserHandle.myUserId(), null,
/* lockdownEnabled */ false);
VpnUtils.setLockdownVpn(getContext(), profile.key); VpnUtils.setLockdownVpn(getContext(), profile.key);
} else { } else {
// update only if lockdown vpn has been changed // update only if lockdown vpn has been changed