| commit | 45ec3191a765d249c93b8a8c95e2366ce32663bb | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Feb 15 00:00:47 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Feb 15 00:00:47 2021 +0000 |
| tree | bd941ea1926b55ea57692a7ebd56dfd280511671 | |
| parent | 944e30cf6cfdb68683c9d84d799957ae99c28ec1 [diff] | |
| parent | fad82fdcf5a8305620a07c7a706e03f19ff59276 [diff] |
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.