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

Merge "Revert "Update to use new ConnectivityManager API."" am: 9c7ddce334 am: 2105dc52dd

Browse Source 
am: 11247ebb53

Change-Id: Id9a817cb440ce1ae538b7f6fd3f5c81a95efb346
This commit is contained in:
Dan Albert
2019-01-24 15:16:38 -08:00
committed by android-build-merger
parent 24ec60a92f 11247ebb53
commit 5d381ac653
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,8 +164,7 @@ public class AppDialogFragment extends InstrumentedDialogFragment implements App
final int userId = getUserId();
try {
if (mPackageInfo.packageName.equals(VpnUtils.getConnectedPackage(mService, userId))) {
mService.setAlwaysOnVpnPackage(userId, null, /* lockdownEnabled */ false,
/* lockdownWhitelist */ null);
mService.setAlwaysOnVpnPackage(userId, null, /* lockdownEnabled */ false);
mService.prepareVpn(mPackageInfo.packageName, VpnConfig.LEGACY_VPN, userId);
}
} catch (RemoteException e) {