OSDN Git Service

Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ...
authorChalard Jean <jchalard@google.com>
Wed, 24 Jan 2018 04:09:44 +0000 (04:09 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 24 Jan 2018 04:09:44 +0000 (04:09 +0000)
commit6568170b32100986a65a042facd78b3dcaf1c5e7
treeea9394e8b6a1dd79aa0e5f29fd4678a43f60c11e
parent6e032246975e08c4264bd711a0ced6e1bbf74c47
parentdda156ab0c5d66ad82bdcf76cda07cbc0a9c8a2e
Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ...

* changes:
  Let network requests see VPNs.
  Move constants into a new file.
  Make sure listen requests from VPN apps see their own networks
  Add a test for new UID checking code.
  Remove UID_RANGES_ADDED and REMOVED.
  Move VPN allowed UIDs into NetworkCapabilities.
  Pre-import to remove a conflict.