Commit Graph

9488 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
7aa97d2b77 [automerger skipped] Merge "Fix setAdministratorUids tests on Q" into rvc-dev am: 0b4ad3a9d5 -s ours am: a678d4fd51 -s ours
am skip reason: Change-Id I1b362660de9733bb9f0ede1ed5cf62279bf1c05e with SHA-1 24260d5e6d is in history

Change-Id: I6d2d3f2b568b39f0ae385a3aff63c84452bce28f
2020-04-06 02:42:49 +00:00
Remi NGUYEN VAN
a760a047d3 [automerger skipped] Merge "Fix setAdministratorUids tests on Q" into rvc-dev am: 0b4ad3a9d5 am: c69180459a -s ours
am skip reason: Change-Id I1b362660de9733bb9f0ede1ed5cf62279bf1c05e with SHA-1 824f80b129 is in history

Change-Id: I12f74893d28783a0299ddf24228e7695cfab667f
2020-04-06 02:42:37 +00:00
Remi NGUYEN VAN
a678d4fd51 [automerger skipped] Merge "Fix setAdministratorUids tests on Q" into rvc-dev am: 0b4ad3a9d5 -s ours
am skip reason: Change-Id I1b362660de9733bb9f0ede1ed5cf62279bf1c05e with SHA-1 824f80b129 is in history

Change-Id: I16bc94e46e253b70ed58f4bbd5d14c1214024f30
2020-04-06 02:24:59 +00:00
Remi NGUYEN VAN
c69180459a Merge "Fix setAdministratorUids tests on Q" into rvc-dev am: 0b4ad3a9d5
Change-Id: Ic59499e070b009dddedcaeb2e6905fb563779841
2020-04-06 02:24:38 +00:00
Remi NGUYEN VAN
0b4ad3a9d5 Merge "Fix setAdministratorUids tests on Q" into rvc-dev 2020-04-06 02:22:37 +00:00
TreeHugger Robot
ba808127e6 [automerger skipped] Merge "Only apply VPN isolation if it's fully routed" into rvc-dev am: 147d1574b1 -s ours am: caa3a41ed6 -s ours
am skip reason: Change-Id I59cf48552bca98092d1212e3d718fd420add5458 with SHA-1 7fb7c3e0bf is in history

Change-Id: I831d43cc9ba89ef8f632c2306b65378895d63499
2020-04-04 04:10:13 +00:00
TreeHugger Robot
b5c22182e8 [automerger skipped] Merge "Only apply VPN isolation if it's fully routed" into rvc-dev am: 147d1574b1 am: 1c221a5295 -s ours
am skip reason: Change-Id I59cf48552bca98092d1212e3d718fd420add5458 with SHA-1 ab8cf306ea is in history

Change-Id: I28e2ff1095f168d1e3c7321ab52629b0a9391c1d
2020-04-04 04:10:04 +00:00
TreeHugger Robot
1c221a5295 Merge "Only apply VPN isolation if it's fully routed" into rvc-dev am: 147d1574b1
Change-Id: Ibd13db0076a1dcaefd3b006001d24ad3e763409f
2020-04-04 03:48:35 +00:00
TreeHugger Robot
caa3a41ed6 [automerger skipped] Merge "Only apply VPN isolation if it's fully routed" into rvc-dev am: 147d1574b1 -s ours
am skip reason: Change-Id I59cf48552bca98092d1212e3d718fd420add5458 with SHA-1 ab8cf306ea is in history

Change-Id: I46103ffe30615b2949cf9d600c32785b3c28b816
2020-04-04 03:48:18 +00:00
TreeHugger Robot
147d1574b1 Merge "Only apply VPN isolation if it's fully routed" into rvc-dev 2020-04-04 03:44:46 +00:00
Remi NGUYEN VAN
24260d5e6d Fix setAdministratorUids tests on Q
setAdministratorUids does not exist on Q, so such tests must be skipped
on Q devices.

Bug: 147903575
Test: atest CtsNetTestCasesLatestSdk on Q and AOSP devices
Merged-In: I1b362660de9733bb9f0ede1ed5cf62279bf1c05e
Change-Id: I1b362660de9733bb9f0ede1ed5cf62279bf1c05e
2020-04-03 09:42:33 +00:00
Remi NGUYEN VAN
e1c94d6fd5 Merge "Fix setAdministratorUids tests on Q" am: 7e3fc61cf1 am: a59e208450 am: 91627585e3
Change-Id: I0044469ee26a2e29969b9a04d68f3e6e1faaba34
2020-04-03 09:04:27 +00:00
Remi NGUYEN VAN
91627585e3 Merge "Fix setAdministratorUids tests on Q" am: 7e3fc61cf1 am: a59e208450
Change-Id: Ifbcb485fad3a61c2cf48fb6e264bcdc130119ff0
2020-04-03 08:41:32 +00:00
Remi NGUYEN VAN
95e3e52b6e [automerger skipped] Merge "Make LinkPropertiesTest compatible with Q" into rvc-dev am: d8223ef5fc am: 03d15b5453 -s ours
am skip reason: Change-Id I38b0d83abf983b3bcc01fc6aea2e5cc307734198 with SHA-1 ccd5ba288a is in history

Change-Id: I4a36bd6fe06407f343fa6a518367c3b9630cbec9
2020-04-03 08:20:08 +00:00
Remi NGUYEN VAN
0d8275588e [automerger skipped] Merge "Make LinkPropertiesTest compatible with Q" into rvc-dev am: d8223ef5fc -s ours am: af77f3649c -s ours
am skip reason: Change-Id I38b0d83abf983b3bcc01fc6aea2e5cc307734198 with SHA-1 7988471ec9 is in history

Change-Id: Ieef14cead5cecaa554553fda864c4275a85a3edb
2020-04-03 08:19:14 +00:00
Remi NGUYEN VAN
af77f3649c [automerger skipped] Merge "Make LinkPropertiesTest compatible with Q" into rvc-dev am: d8223ef5fc -s ours
am skip reason: Change-Id I38b0d83abf983b3bcc01fc6aea2e5cc307734198 with SHA-1 7988471ec9 is in history

Change-Id: I329d322e10096178ea82d213414c2866f596ff12
2020-04-03 08:17:11 +00:00
Remi NGUYEN VAN
03d15b5453 Merge "Make LinkPropertiesTest compatible with Q" into rvc-dev am: d8223ef5fc
Change-Id: I756521af50e0176817cc1502e5a5b2ad15979817
2020-04-03 08:17:06 +00:00
Remi NGUYEN VAN
a59e208450 Merge "Fix setAdministratorUids tests on Q" am: 7e3fc61cf1
Change-Id: I1f9a335e4f7b97d2af47745709d90cfdab353154
2020-04-03 08:17:00 +00:00
Remi NGUYEN VAN
7e3fc61cf1 Merge "Fix setAdministratorUids tests on Q" 2020-04-03 07:54:59 +00:00
Remi NGUYEN VAN
d8223ef5fc Merge "Make LinkPropertiesTest compatible with Q" into rvc-dev 2020-04-03 07:52:26 +00:00
Automerger Merge Worker
b8eae6fdf5 Merge "Merge "Added a new capability for temporarily unmetered network." into rvc-dev am: 0edabc5e4e am: 1dbf63da06" into rvc-d1-dev-plus-aosp 2020-04-03 05:26:13 +00:00
Lorenzo Colitti
6095f2122d Merge "Added a new capability for temporarily unmetered network." into rvc-dev am: 0edabc5e4e am: 53e0564ca4
Change-Id: I71f7a2735dd8152889f95d004dcc45af79d940a6
2020-04-03 05:26:04 +00:00
Lorenzo Colitti
9da2c8b650 Merge "Added a new capability for temporarily unmetered network." into rvc-dev am: 0edabc5e4e am: 1dbf63da06
Change-Id: I6e4a59ed2d070c9a4c8eadd843baaa891b73e7d6
2020-04-03 05:25:58 +00:00
Lorenzo Colitti
53e0564ca4 Merge "Added a new capability for temporarily unmetered network." into rvc-dev am: 0edabc5e4e
Change-Id: I4d43b28d25529d4dd9e4304c4edf95edb5c5110b
2020-04-03 05:07:20 +00:00
Lorenzo Colitti
1dbf63da06 Merge "Added a new capability for temporarily unmetered network." into rvc-dev am: 0edabc5e4e
Change-Id: I2954f582524903c542a65439fba05af6cc37aa0f
2020-04-03 05:07:14 +00:00
Jack Yu
71863e9604 Added a new capability for temporarily unmetered network.
Added a new network capability TEMOPORARILY_NOT_METERED to support
the case that a network can temporarily become unmetered. This
allows carriers to deploy unmetered 5G network. When devices
camp on 5G network, this capability will be dynamically added
to the network and will be removed once leaving 5G coverage.

Bug: 153081494
Test: Manual
Change-Id: I10e26cb0852e67f614e7b9c4e49f95e078602e21
2020-04-02 19:28:41 -07:00
Lorenzo Colitti
ccf3a67aa1 Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." am: 426ce6ee78 am: 0d904a3b18 am: 5916708919
Change-Id: I78c0f8204c6fd900e946821ad9f29624a8406e45
2020-04-02 15:47:14 +00:00
Lorenzo Colitti
5916708919 Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." am: 426ce6ee78 am: 0d904a3b18
Change-Id: I9521b1a243f6907b790888c7a1e32991da05cf33
2020-04-02 15:24:59 +00:00
Lorenzo Colitti
0d904a3b18 Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." am: 426ce6ee78
Change-Id: I542f805511fe770c7869b4ba989416c179d28687
2020-04-02 15:06:25 +00:00
Lorenzo Colitti
426ce6ee78 Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." 2020-04-02 14:45:11 +00:00
Lorenzo Colitti
d523d1416d Rename the *Nat64Prefix to *Nat64PrefixFromDns.
This just a rename with no functional changes at all. It is
preparation for supporting getting the NAT64 prefix from the
RA.

Bug: 150648313
Test: covered by existing ConnectivityServiceTest and Nat464XlatTest
Change-Id: Ia9a09a708870827b1e4cf068f930fa9542dd116c
2020-04-02 22:48:03 +09:00
Lorenzo Colitti
3f9530b568 [automerger skipped] Merge "Add more tests in LinkPropertiesTests.java" into rvc-dev am: 86ae134de8 -s ours am: 7378b9cc59 -s ours
am skip reason: Change-Id Ie77dd7eb5c7ecc763c661e8510f9a308e695e77f with SHA-1 55c6a844fc is in history

Change-Id: If7f339219052efb617eeaf9f878b01fac5394859
2020-04-02 11:11:17 +00:00
Lorenzo Colitti
652f332c21 [automerger skipped] Merge "Add more tests in LinkPropertiesTests.java" into rvc-dev am: 86ae134de8 am: adcc974e20 -s ours
am skip reason: Change-Id Ie77dd7eb5c7ecc763c661e8510f9a308e695e77f with SHA-1 55c6a844fc is in history

Change-Id: I2790f87a2211ae084cd11f373e94aac3e1eba291
2020-04-02 11:10:37 +00:00
Lorenzo Colitti
adcc974e20 Merge "Add more tests in LinkPropertiesTests.java" into rvc-dev am: 86ae134de8
Change-Id: Icb07eade679f34a7872050ca711aa45ffd11e462
2020-04-02 10:52:46 +00:00
Lorenzo Colitti
7378b9cc59 [automerger skipped] Merge "Add more tests in LinkPropertiesTests.java" into rvc-dev am: 86ae134de8 -s ours
am skip reason: Change-Id Ie77dd7eb5c7ecc763c661e8510f9a308e695e77f with SHA-1 55c6a844fc is in history

Change-Id: Ie4b165c0543676d142fc9dd216e689e2aab18a35
2020-04-02 10:52:17 +00:00
Lorenzo Colitti
7fb7c3e0bf Only apply VPN isolation if it's fully routed
VPN is considered fully routed if both IPv4 and IPv6 have
either a default route or a prohibit route.

Bug: 145332510
Test: atest FrameworksNetTests
Merged-In: I59cf48552bca98092d1212e3d718fd420add5458
Change-Id: I59cf48552bca98092d1212e3d718fd420add5458
2020-04-02 10:36:19 +00:00
Lorenzo Colitti
86ae134de8 Merge "Add more tests in LinkPropertiesTests.java" into rvc-dev 2020-04-02 10:35:49 +00:00
Chalard Jean
3f3dc53af5 [automerger skipped] Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 9122e56202 am: 0d7aa85f99 -s ours am: 5f6ebed9d7 -s ours
am skip reason: Change-Id I076876a6662bde143ef7d315ce3767acafff93c1 with SHA-1 51b8e287ad is in history

Change-Id: I4562b95900e42d0bb995556e837e096b99d9991e
2020-04-02 07:00:14 +00:00
Chalard Jean
52f6d0bc25 [automerger skipped] Address further API council comments. am: 691a34d96b am: 811833721f -s ours am: 6460bd74fa -s ours
am skip reason: Change-Id I8a785ae0e74e659c317deaaa28c203356c7766ed with SHA-1 812e8cb87e is in history

Change-Id: If9d9cb651cb121fb6620929b589a8c02fbc2cefb
2020-04-02 07:00:10 +00:00
Chalard Jean
5f6ebed9d7 [automerger skipped] Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 9122e56202 am: 0d7aa85f99 -s ours
am skip reason: Change-Id I076876a6662bde143ef7d315ce3767acafff93c1 with SHA-1 51b8e287ad is in history

Change-Id: Ia71fd58217ec6dab128dc83781fb7e42e412472e
2020-04-02 06:37:24 +00:00
Chalard Jean
6460bd74fa [automerger skipped] Address further API council comments. am: 691a34d96b am: 811833721f -s ours
am skip reason: Change-Id I8a785ae0e74e659c317deaaa28c203356c7766ed with SHA-1 812e8cb87e is in history

Change-Id: I0a0cae7327fd84f078e1027840a86b1db090d9c3
2020-04-02 06:37:15 +00:00
Chalard Jean
0d7aa85f99 Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 9122e56202
Change-Id: I1149e5d0c93885d401817d65af02b6ae47f51dfc
2020-04-02 06:15:02 +00:00
Chalard Jean
811833721f Address further API council comments. am: 691a34d96b
Change-Id: I237fc6a82df362d5463e8e518967de28735bf2da
2020-04-02 06:14:55 +00:00
Chalard Jean
9122e56202 Merge changes from topics "api-fix-networkagent", "satisfiedby"
* changes:
  Rename satisfiedBy into canBeSatisfiedBy
  Address further API council comments.
2020-04-02 05:51:02 +00:00
Automerger Merge Worker
8da7c53635 Merge "Merge "Only apply VPN isolation if it's fully routed" am: 5c5d1a1282 am: d24e7fb5a1" into rvc-dev-plus-aosp am: 8eec601b70
Change-Id: I5caa0ec3eb4e3a91c2b088ba8094d1bda0e1a23f
2020-04-02 05:13:04 +00:00
Remi NGUYEN VAN
824f80b129 Fix setAdministratorUids tests on Q
setAdministratorUids does not exist on Q, so such tests must be skipped
on Q devices.

Bug: 147903575
Test: atest CtsNetTestCasesLatestSdk on Q and AOSP devices
Change-Id: I1b362660de9733bb9f0ede1ed5cf62279bf1c05e
2020-04-02 13:58:03 +09:00
Lorenzo Colitti
62d2333abd Merge "Only apply VPN isolation if it's fully routed" am: 5c5d1a1282 am: d24e7fb5a1
Change-Id: I9230f1a73698344eb40ae3e0ebc5d73cc259f2d0
2020-04-02 04:50:41 +00:00
Lorenzo Colitti
d24e7fb5a1 Merge "Only apply VPN isolation if it's fully routed" am: 5c5d1a1282
Change-Id: I5267b567e1b9babe3bc95d2984262dc864681a2d
2020-04-02 04:32:04 +00:00
Lorenzo Colitti
5c5d1a1282 Merge "Only apply VPN isolation if it's fully routed" 2020-04-02 04:10:12 +00:00
Aaron Huang
ccd5ba288a Make LinkPropertiesTest compatible with Q
CompareResult had been moved from LinkProperties to LinkPropertiesUtils
so this change ignores testCompareResult() on Q and only check
compareAllRoutes() works while android version is at least R.

Bug: 151782584
Test: atest CtsNetTestCasesLatestSdk:LinkPropertiesTest
Merged-In: I38b0d83abf983b3bcc01fc6aea2e5cc307734198
Change-Id: I38b0d83abf983b3bcc01fc6aea2e5cc307734198
2020-04-02 03:30:49 +00:00