Merge "Update to use new ConnectivityManager API." am: 70b1830e7e am: 7c47743851

am: 3184142cbe Change-Id: I6bc7277d0f1db1576b369443719c449fc8eeed75
2019-01-28 22:14:17 -08:00
parent 82b15f4e9e 3184142cbe
commit e1dd64ef2e
3 changed files with 4 additions and 3 deletions
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -176,7 +176,7 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements

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