commit 684d3471ebdb4b0522f26a30a70d62a41e0b9dee
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 30711bc0d3caba9c2fd453b7bc0dfab8de662071
parent 66ef4728a18e551f6642920e3c7e37d56b95439b

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 66ef4728a18e551f6642920e3c7e37d56b95439b.

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

Bug: 173331190
Test: treehugger
Change-Id: Ife3607c024006ce4fe46c981e9742170becb6331