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

am: 11247ebb53

Change-Id: Id9a817cb440ce1ae538b7f6fd3f5c81a95efb346

src/com/android/settings/vpn2/AppDialogFragment.java

@@ -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) {

src/com/android/settings/vpn2/AppManagementFragment.java

@@ -225,7 +225,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
 
     private boolean setAlwaysOnVpn(boolean isEnabled, boolean isLockdown) {
         return mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId,
-                isEnabled ? mPackageName : null, isLockdown, /* lockdownWhitelist */ null);
+                isEnabled ? mPackageName : null, isLockdown);
     }
 
     private void updateUI() {

src/com/android/settings/vpn2/ConfigDialogFragment.java

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