diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-02-22 03:18:42 +0000 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2021-02-22 05:07:22 +0000 |
| commit | fd6a27bf49f3f94597c92fc2345f8699ca6a2219 (patch) | |
| tree | 13d88488d84de1d8c6c3f6cdbe21dd08a347319a /tests/net/java/com/android/server/ConnectivityServiceTest.java | |
| parent | 51bf8e979eddcf9c8b3d2a8a96d49ed52aa7f8b6 (diff) | |
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
Diffstat (limited to 'tests/net/java/com/android/server/ConnectivityServiceTest.java')
0 files changed, 0 insertions, 0 deletions