tree 1829860251f0e191b3c9f7ce7b30e0534aec5367
parent 1c03df3a3eabe725848583a8b3f56afad644b4ef
parent 4777edca7c33ec7c49b2498182f08e4df876d10d
author Lorenzo Colitti <lorenzo@google.com> 1613347247 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1613347247 +0000

Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63

* changes:
  Check registering system default callback needs NETWORK_SETTINGS.
  Move VPN code from ConnectivityService to VpnManagerService.
  Add a skeleton VpnManagerService, and start it on boot.
  Convert LockdownVpnTracker to NetworkCallbacks.
  Minor fixes to VpnTransportInfo.