Commit Graph

1703 Commits

Author SHA1 Message Date
Junyu Lai
920786839e Merge "Fix NetworkStatsApiTest failed on Q device" am: cd7c6cb6ca am: e1d7d536e3 am: a7ae7a7d06 am: de432097f0 am: d6f09333fb
Change-Id: Id74e9e23bd06de4bca803b4c21b1883caeceab57
2020-04-07 12:01:32 +00:00
Junyu Lai
a7ae7a7d06 Merge "Fix NetworkStatsApiTest failed on Q device" am: cd7c6cb6ca am: e1d7d536e3
Change-Id: Ie10c2bb91fabe8289c649333c215ab6dc22f18ff
2020-04-07 11:19:54 +00:00
Junyu Lai
cd7c6cb6ca Merge "Fix NetworkStatsApiTest failed on Q device" 2020-04-07 10:49:19 +00:00
Treehugger Robot
8fb85b1c5e Merge "Add trivial dependencies tests for the network stack" am: a287e43a36 am: 2adba91843 am: 1226d2b055 am: b22edb7504 am: a333827bb7
Change-Id: Ie34b14334e54af254533e0a7df2aa6ae9dc26510
2020-04-07 09:56:23 +00:00
Treehugger Robot
1226d2b055 Merge "Add trivial dependencies tests for the network stack" am: a287e43a36 am: 2adba91843
Change-Id: I081907a334d98bf4b793d714b82133ed217bb969
2020-04-07 09:13:01 +00:00
Treehugger Robot
a287e43a36 Merge "Add trivial dependencies tests for the network stack" 2020-04-07 08:34:44 +00:00
Lucas Lin
8d9259b133 Merge "Add more tests in NetworkCapabilitiesTest.java" am: 60ee9b5a9f am: d9a6a6b8b6 am: ea34cf06d5 am: 8979036aed am: 9b8835653a
Change-Id: I394cc33150ef992b8bad75246199ee23fd2947e6
2020-04-07 07:58:45 +00:00
Lucas Lin
ea34cf06d5 Merge "Add more tests in NetworkCapabilitiesTest.java" am: 60ee9b5a9f am: d9a6a6b8b6
Change-Id: If955360da1fb75e174a4ecfff46988f65db17c8a
2020-04-07 07:14:28 +00:00
junyulai
3bf1224afc Fix NetworkStatsApiTest failed on Q device
Currently, the addEntry method is used in constructor of test,
which is not correct since there is no such method in Q devices.

Thus, initialize of NetworkStats variables outside of constructor.

Test: atest NetworkStatsApiTest
Test: atest CtsNetTestCasesLatestSdk:NetworkStatsApiTest on Q device
Bug: 150644692
Change-Id: Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea
2020-04-07 15:07:16 +08:00
Chalard Jean
dcb74c71db Add trivial dependencies tests for the network stack
Test: this
Bug: 153033018
Change-Id: Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81
2020-04-07 14:42:00 +09:00
lucaslin
e408eb55dc Add more tests in NetworkCapabilitiesTest.java
Test deduceRestrictedCapability(), getAdministratorUids(),
setAdministratorUids(), getNetworkSpecifier(), getOwnerUid(),
setLinkDownstreamBandwidthKbps(), setLinkUpstreamBandwidthKbps()
and setSignalStrength().

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkCapabilitiesTest
Change-Id: I90c7a8c47710ea4ad8e8d2682c10440fd7f82270
2020-04-07 11:58:22 +08:00
Remi NGUYEN VAN
00b9c612d7 Merge "Fix setAdministratorUids tests on Q" am: 2497897867 am: 9972a5ac3b am: 59e5a2de32 am: 9e024ca5cb am: 679b95999e
Change-Id: If5b57ee838bd61a15c6fdeeb68e14ffd22064f90
2020-04-03 09:43:56 +00:00
Remi NGUYEN VAN
59e5a2de32 Merge "Fix setAdministratorUids tests on Q" am: 2497897867 am: 9972a5ac3b
Change-Id: Ifbcb485fad3a61c2cf48fb6e264bcdc130119ff0
2020-04-03 08:41:32 +00:00
Remi NGUYEN VAN
2497897867 Merge "Fix setAdministratorUids tests on Q" 2020-04-03 07:54:59 +00:00
Lorenzo Colitti
65a6e2ea01 Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." am: 01314aedbf am: bcb70090e9 am: 61097ffeea am: adfb55300d am: cb027e9334
Change-Id: I0f6623a5ff918c7d01dcfd6fba076f6559a324fd
2020-04-02 19:58:27 +00:00
Automerger Merge Worker
34a1e6bfd2 Merge "Merge "Only apply VPN isolation if it's fully routed" am: f198a43744 am: b9cd996758" into rvc-dev-plus-aosp am: 8eec601b70 am: 91c8d80262 am: baeca5cf20
Change-Id: Ie61a241b2b80ea12c60a58c5e26b5af34e02a5ef
2020-04-02 18:52:50 +00:00
Junyu Lai
6f23d26755 Merge changes from topic "sp26-networkstats-cts" am: 78bae7423a am: e040b441b0 am: b8886a3399 am: dd89bec29f am: c73c774659
Change-Id: I133100effc8a0f6318b2574f09f3da416e7b5107
2020-04-02 18:36:31 +00:00
junyulai
7367523ccb [SP26.2] add a method in NetworkStats that removes empty entries am: 6d745cc0a8 am: 61860a023a am: eb6af3e20c am: 0f2ee895bb am: 6c615f7f0a
Change-Id: I6397ef1dd483d0d2f62cfcf044fa6b89b3c39982
2020-04-02 18:36:24 +00:00
Lorenzo Colitti
61097ffeea Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." am: 01314aedbf am: bcb70090e9
Change-Id: I9521b1a243f6907b790888c7a1e32991da05cf33
2020-04-02 15:24:59 +00:00
Lorenzo Colitti
fff75393c5 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
Chalard Jean
2e64ca57b8 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
Remi NGUYEN VAN
17ab7ac36a 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
8e52c6d4be Merge "Only apply VPN isolation if it's fully routed" am: f198a43744 am: b9cd996758
Change-Id: I9230f1a73698344eb40ae3e0ebc5d73cc259f2d0
2020-04-02 04:50:41 +00:00
Lorenzo Colitti
f198a43744 Merge "Only apply VPN isolation if it's fully routed" 2020-04-02 04:10:12 +00:00
Junyu Lai
b8886a3399 Merge changes from topic "sp26-networkstats-cts" am: 78bae7423a am: e040b441b0
Change-Id: I0964b1752acbba767135c960aba12f169b3f852c
2020-04-02 02:40:53 +00:00
junyulai
eb6af3e20c [SP26.2] add a method in NetworkStats that removes empty entries am: 6d745cc0a8 am: 61860a023a
Change-Id: I388b1d3677d362da2595739913880efa9a643a03
2020-04-02 02:40:42 +00:00
junyulai
61860a023a [SP26.2] add a method in NetworkStats that removes empty entries am: 6d745cc0a8
Change-Id: Ieee0896672625f3bab9ec02a5efa495a9d1f001b
2020-04-02 02:21:20 +00:00
Junyu Lai
78bae7423a Merge changes from topic "sp26-networkstats-cts"
* changes:
  [SP26] add CTS for NetworkStats
  [SP26.2] add a method in NetworkStats that removes empty entries
2020-04-02 02:00:59 +00:00
Chalard Jean
82acfd29a1 Rename satisfiedBy into canBeSatisfiedBy
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I076876a6662bde143ef7d315ce3767acafff93c1
Merged-In: I076876a6662bde143ef7d315ce3767acafff93c1
2020-04-01 20:38:30 +08:00
junyulai
6d745cc0a8 [SP26.2] add a method in NetworkStats that removes empty entries
In current design, entries with zeros are preserved after
addition/subtraction. These entries are not very useful
and lead to difficulty of verifying the result of
addition/subtraction.

However, change the behavior in the original NetworkStats
is considered risky in current stage.

Thus, this change provide a function that could remove these
empty entries in tests.

Test: atest FrameworksNetTests
Bug: 152827872
Bug: 150644692
Change-Id: I40a76935d55712b8083ee1e17e137a8a4ef5e029
2020-04-01 16:46:08 +08:00
junyulai
169246fd17 [SP26] add CTS for NetworkStats
Test: atest NetworkStatsApiTest
Test: atest CtsNetTestCasesLatestSdk:NetworkStatsApiTest on Q device
Bug: 150644692
Change-Id: I690704b43cfd16de70c4c83916f6d750cf613f67
2020-04-01 16:46:08 +08:00
Rubin Xu
fa429013a0 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
Change-Id: I59cf48552bca98092d1212e3d718fd420add5458
2020-04-01 09:36:29 +01:00
Cody Kesting
fa8ff5dcaf Merge "Sort administrator UIDs for NetworkCapabilities." am: 92e4bb4455 am: c475e2912b am: 0b68045244 am: 5188f97816 am: 81c1923e13
Change-Id: I7d8031b1ff926ddf5b285a8ed121713562c47d96
2020-03-31 21:46:26 +00:00
Cody Kesting
a9bde1ae9a Merge "Add combine() and equals() for NetworkCapabilities admin UIDs." am: 1bf4b1f47b am: cfd382a47c am: 3e23762597 am: b0857ba32a am: 25fd390b7e
Change-Id: Iebf89c73250c584f0925dd7b90934bf2713ac8b9
2020-03-31 21:45:59 +00:00
Cody Kesting
c7044f868b Merge "Use IBinder as key for ConnectivityDiagnostics storage in CS." am: aa53148caf am: f580595f99 am: b3541c0513 am: acde589340 am: 38b723b5fd
Change-Id: I830707cdcccdcc56a4247cdf44327b71bbbdb3bc
2020-03-31 21:43:45 +00:00
Cody Kesting
3abf07a6b4 Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics." am: 77f2293b06 am: c3a02d033f am: 5c72dc9cd1 am: 0cb309092a am: 3c40c04597
Change-Id: Ie05e5f2c7e42244a77b4c3322e0ca4467f193fa6
2020-03-31 20:45:35 +00:00
Chiachang Wang
0f50a597eb Merge "Update constructor of NetworkMonitor" am: 42956a037c am: c513ab9b0c am: 6b34f49c99 am: 088f4a89f5 am: f52a73d6d8
Change-Id: I0c65eac7372513519683a84383936c9781c8ced4
2020-03-31 19:10:18 +00:00
Cody Kesting
0cb309092a Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics." am: 77f2293b06 am: c3a02d033f am: 5c72dc9cd1
Change-Id: I8602fabac45469f1e5873459ccfb03561348ffcb
2020-03-31 18:58:48 +00:00
Aaron Huang
d29b39ba68 Merge "Make LinkPropertiesTest compatible with Q" am: 0e9d759c56 am: a62a8a0b63 am: 7dae24c85d am: 678ea74867 am: b63669409e
Change-Id: I223ea3a9ccf2ba3c35ed3b31b88c6f83e0aae970
2020-03-31 18:43:09 +00:00
Lucas Lin
2a1dcc0043 Merge "Add MatchAllNetworkSpecifierTest" am: d410caa3b1 am: ca71c1d1ae am: c79beb1071 am: a0c672766c am: a04440d1a0
Change-Id: I6c6911041aff1b245e576109a879247cc256093b
2020-03-31 18:35:12 +00:00
Lucas Lin
a98716ed93 Merge "Add more tests in LinkPropertiesTests.java" am: 23890535a1 am: a777fa382d am: 12f263070d am: 58ddf22c94 am: aa256ab3aa
Change-Id: I2bae76dc93e7aa02efe25dca4b6e99692c79135a
2020-03-31 18:31:33 +00:00
Cody Kesting
0b68045244 Merge "Sort administrator UIDs for NetworkCapabilities." am: 92e4bb4455 am: c475e2912b
Change-Id: I453f81bcb7c426ab4b529acce5c32c502a29331b
2020-03-31 18:17:14 +00:00
Cody Kesting
3e23762597 Merge "Add combine() and equals() for NetworkCapabilities admin UIDs." am: 1bf4b1f47b am: cfd382a47c
Change-Id: Ic8fc22f0eb47836053fc6b9423018c16ae46ef46
2020-03-31 18:16:18 +00:00
Benedict Wong
22a316a8e6 Merge changes I97ba5903,Icd80b368 into rvc-dev am: a7e71febc5 am: 2933f38880 am: 6c31dbbf08 am: ba1c34d2ea
Change-Id: I23bd1b785a0b9920c9f2402d92e6b0c00362cf87
2020-03-31 18:02:09 +00:00
Chiachang Wang
088f4a89f5 Merge "Update constructor of NetworkMonitor" am: 42956a037c am: c513ab9b0c am: 6b34f49c99
Change-Id: I8d10209a18c3d1c76f57b27bab75168a4af76c69
2020-03-31 17:56:15 +00:00
Aaron Huang
678ea74867 Merge "Make LinkPropertiesTest compatible with Q" am: 0e9d759c56 am: a62a8a0b63 am: 7dae24c85d
Change-Id: If22bcfadfc71bb8dd8be08740be202482ed23dd3
2020-03-31 17:48:44 +00:00
Lucas Lin
a0c672766c Merge "Add MatchAllNetworkSpecifierTest" am: d410caa3b1 am: ca71c1d1ae am: c79beb1071
Change-Id: Icaefd5ae4ad814385f2aa0b83aa94a88167c8af3
2020-03-31 17:46:45 +00:00
Lucas Lin
58ddf22c94 Merge "Add more tests in LinkPropertiesTests.java" am: 23890535a1 am: a777fa382d am: 12f263070d
Change-Id: Ia1f4f43d9192b6ad84a6f297ccf3114143b9900b
2020-03-31 17:46:00 +00:00
Cody Kesting
92e4bb4455 Merge "Sort administrator UIDs for NetworkCapabilities." 2020-03-31 17:43:02 +00:00
Cody Kesting
1bf4b1f47b Merge "Add combine() and equals() for NetworkCapabilities admin UIDs." 2020-03-31 17:42:18 +00:00