diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-02-10 06:38:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-10 06:38:41 +0000 |
| commit | 250855cb843cb12e7e0b9a0d353b28346e8b191a (patch) | |
| tree | 2366618cc3ffe57a86fee775e5a9c53266095e97 /keystore/java/android/security/AndroidKeyStoreMaintenance.java | |
| parent | c84bc1f13c72395d7ab1a85a8267e01e2483169e (diff) | |
| parent | 9cc08edf1f31f615b8fc0dab653f484f9ca22b5d (diff) | |
Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo"
* changes:
Stop using mVpns in getConnectionOwnerUid.
Add a VpnTransportInfo object.
Add a registerSystemDefaultNetworkCallback method.
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStoreMaintenance.java')
0 files changed, 0 insertions, 0 deletions