| commit | d18e61a6d11e6a59ba9f8f606d0d595bf06c2764 | [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 | cbe74178fe73a2d4c651e90f875a02acd2c4308b | |
| parent | 6e2d702d373b25603b85436e66b06315e5f12cbf [diff] | |
| parent | 842075ed8e87a6936f29476070dcb39addc4e7f0 [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.