commit fd6a27bf49f3f94597c92fc2345f8699ca6a2219
author Lorenzo Colitti <lorenzo@google.com> Mon Feb 22 03:18:42 2021 +0000
committer Lorenzo Colitti <lorenzo@google.com> Mon Feb 22 05:07:22 2021 +0000
tree 13d88488d84de1d8c6c3f6cdbe21dd08a347319a
parent 51bf8e979eddcf9c8b3d2a8a96d49ed52aa7f8b6

Revert "Revert "Delete VPN methods in ConnectivityManager.""

1. Stop using ConnectivityManager for VPNs in VpnDialogs.
2. Delete updateLockdownVpn, since all callers have been migrated
   to calling VpnManager directly.
3. Delete the call to VpnManager in factoryReset, since the only
   caller (ResetNetworkConfirm) has been updated to call into
   VpnManager directly.
4. Delete getVpnManager, since it is now unused.

This reverts commit 51bf8e979eddcf9c8b3d2a8a96d49ed52aa7f8b6.

Reason for revert: should be safe to submit now that aosp/1596096 is merged

Bug: 173331190
Test: treehugger
Change-Id: Ife3607c024006ce4fe46c981e9742170becb6331