Commit Graph

9637 Commits

Author SHA1 Message Date
Automerger Merge Worker
c69a088e09 Merge "[automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe -s ours am: de3a42dd7a -s ours" into rvc-d1-dev-plus-aosp am: 1c52bbae45 -s ours
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 dcb74c71db is in history

Change-Id: Ifc4b66e5458c7714b2d5f238ece2ac8b6b10569b
2020-04-08 05:04:17 +00:00
Chalard Jean
93aeed56c3 [automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe am: d2949a4c5c -s ours am: 86dd26b505 -s ours
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 dcb74c71db is in history

Change-Id: I61a8f2c4c5d15fce1118c3b5898fc49fb70d2669
2020-04-08 05:03:36 +00:00
Chalard Jean
6affb29437 [automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe -s ours am: de3a42dd7a -s ours
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 dcb74c71db is in history

Change-Id: Ia94c32fbc0e2aee1fd8d860b0ffc7068a5deb94d
2020-04-08 04:49:55 +00:00
Chalard Jean
86dd26b505 [automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe am: d2949a4c5c -s ours
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 dcb74c71db is in history

Change-Id: I55ddfc307214b110c223d91b3cc0cdd601d0aca1
2020-04-08 04:49:40 +00:00
Chalard Jean
d2949a4c5c Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe
Change-Id: I24ed3891a893bf5cc6cc16b3210b2e4264008ce7
2020-04-08 04:37:32 +00:00
Chalard Jean
de3a42dd7a [automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe -s ours
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 dcb74c71db is in history

Change-Id: I08107ba6c907bae11c1f304d82cde94d7ce2e306
2020-04-08 04:37:22 +00:00
Junyu Lai
d6f09333fb Merge "Fix NetworkStatsApiTest failed on Q device" am: cd7c6cb6ca am: e1d7d536e3 am: a7ae7a7d06 am: de432097f0
Change-Id: I7b01321ba340000a9629aa5db825b50ec98365b8
2020-04-07 11:47:08 +00:00
Junyu Lai
de432097f0 Merge "Fix NetworkStatsApiTest failed on Q device" am: cd7c6cb6ca am: e1d7d536e3 am: a7ae7a7d06
Change-Id: Ibac7b46edb13a05c825dd34ffd9c7626c33019f2
2020-04-07 11:33:47 +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
e1d7d536e3 Merge "Fix NetworkStatsApiTest failed on Q device" am: cd7c6cb6ca
Change-Id: I3657e473a5c8ba45da7f1845ce860c0a494878f7
2020-04-07 11:04:39 +00:00
Junyu Lai
cd7c6cb6ca Merge "Fix NetworkStatsApiTest failed on Q device" 2020-04-07 10:49:19 +00:00
Chalard Jean
71e8627978 [automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 -s ours am: fe7e08f6ea -s ours am: 0800017588 -s ours
am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 c7e1877d1c is in history

Change-Id: I3aeb2667c0e09b9d39220efbe7bc188688f9a800
2020-04-07 10:20:51 +00:00
Chalard Jean
bdc29fb104 [automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 am: 93ef311226 -s ours am: 1f12fbe878 -s ours
am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 c7e1877d1c is in history

Change-Id: Id6e3805ee9a49e9edc2a6a16e60c3f54ade2990a
2020-04-07 10:20:14 +00:00
Treehugger Robot
ff3c00dda0 Add trivial dependencies tests for the network stack
Test: this
Bug: 153033018

Change-Id: I3e66752ebfb5f4324d897210ce26ddaf67f53228
Merged-In: Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81
(cherry picked from commit c79353f2e4a99635bcf6eb9177c971f268f71204, aosp/1275998)
2020-04-07 10:09:10 +00:00
Chalard Jean
0800017588 [automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 -s ours am: fe7e08f6ea -s ours
am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 c7e1877d1c is in history

Change-Id: Icab560cf608837222727b6176155d96498838870
2020-04-07 09:56:20 +00:00
Chalard Jean
1f12fbe878 [automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 am: 93ef311226 -s ours
am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 c7e1877d1c is in history

Change-Id: I2fcb07147f02fd51c2ae145c9278930b439b71c9
2020-04-07 09:56:05 +00:00
Chalard Jean
93ef311226 Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570
Change-Id: I174ea95f65bce63043fb3fbe9f4d5a0839ae566e
2020-04-07 09:35:22 +00:00
Treehugger Robot
a333827bb7 Merge "Add trivial dependencies tests for the network stack" am: a287e43a36 am: 2adba91843 am: 1226d2b055 am: b22edb7504
Change-Id: Ib64186a32e2cfce88d1d0d6d77f799c7da1d942f
2020-04-07 09:34:35 +00:00
Chalard Jean
fe7e08f6ea [automerger skipped] Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 -s ours
am skip reason: Change-Id I3e17211c03bc74426bf5e2e414ec322d73b0060b with SHA-1 c7e1877d1c is in history

Change-Id: I041a05e6f01033bb559628ae8b18f169e551c3fd
2020-04-07 09:34:26 +00:00
Treehugger Robot
b22edb7504 Merge "Add trivial dependencies tests for the network stack" am: a287e43a36 am: 2adba91843 am: 1226d2b055
Change-Id: Id17b2dbc60daf0328ce6fe0dd78920ca09285ce7
2020-04-07 09:18:09 +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
2adba91843 Merge "Add trivial dependencies tests for the network stack" am: a287e43a36
Change-Id: I940782a1ae97759085a4a6f67c0358e6bfdbd328
2020-04-07 08:55:37 +00:00
Treehugger Robot
a287e43a36 Merge "Add trivial dependencies tests for the network stack" 2020-04-07 08:34:44 +00:00
Lucas Lin
9b8835653a Merge "Add more tests in NetworkCapabilitiesTest.java" am: 60ee9b5a9f am: d9a6a6b8b6 am: ea34cf06d5 am: 8979036aed
Change-Id: I2db4a058a80dfb5366679d7a5ca6a14d10065772
2020-04-07 07:44:50 +00:00
Treehugger Robot
25fd4c1695 Fix a stupid NPE
Okay so this is really not a behavior change as it converts an
NPE into an illegal argument exception, but still, that's what
should happen (and that's what the upcoming test actually tests
for).

Test: upcoming NetworkAgentTest
Bug: 139268426
Change-Id: I0d9b8cb8f8dcb587b9430b486b863efb9e9e77ef
Merged-In: I3e17211c03bc74426bf5e2e414ec322d73b0060b
(cherry picked from commit 827d7ceea1e83cca9ba3f6189e20b6780c0194ed, aosp/1277595)
2020-04-07 07:29:10 +00:00
Lucas Lin
8979036aed Merge "Add more tests in NetworkCapabilitiesTest.java" am: 60ee9b5a9f am: d9a6a6b8b6 am: ea34cf06d5
Change-Id: Ice4f8e2383586c9f68209028d7c3cd281f39f3a5
2020-04-07 07:27:03 +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
Lucas Lin
d9a6a6b8b6 Merge "Add more tests in NetworkCapabilitiesTest.java" am: 60ee9b5a9f
Change-Id: Ie50a0e4e332dd16c7300efb488f4ac4f25c3b6c9
2020-04-07 06:59:14 +00:00
Treehugger Robot
fb6bd86959 Merge "Fix a stupid NPE" am: 30673a9684 am: fb3e94c8d8 am: 2e99fd04fe am: 9762007659
Change-Id: I7f054bd134a0c9a006f3fe9196cc6886bb224caa
2020-04-07 06:46:35 +00:00
Lucas Lin
60ee9b5a9f Merge "Add more tests in NetworkCapabilitiesTest.java" 2020-04-07 06:45:09 +00:00
Treehugger Robot
9762007659 Merge "Fix a stupid NPE" am: 30673a9684 am: fb3e94c8d8 am: 2e99fd04fe
Change-Id: Ib5fa0c4ae1c73094bbe08468170c96d4dc0692a5
2020-04-07 06:32:14 +00:00
Treehugger Robot
2e99fd04fe Merge "Fix a stupid NPE" am: 30673a9684 am: fb3e94c8d8
Change-Id: I68e5702008a82d93c634fd45c2bd83a33fdf0cd2
2020-04-07 06:18:28 +00:00
Treehugger Robot
fb3e94c8d8 Merge "Fix a stupid NPE" am: 30673a9684
Change-Id: I3a167339e4007e5cb16488e701b9ca16937da265
2020-04-07 06:02:50 +00:00
Treehugger Robot
30673a9684 Merge "Fix a stupid NPE" 2020-04-07 05:53:10 +00: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
Automerger Merge Worker
9a169c3783 Merge "[automerger skipped] Merge "Refactor the Nat464Xlat function for simplicity." into rvc-dev am: 672da12990 -s ours am: deaf9677f4 -s ours" into rvc-d1-dev-plus-aosp am: 9df7265126 -s ours
am skip reason: Change-Id Ice536bcb269cc8b040c6e7a72c15d0bc8b5bd235 with SHA-1 5ce7a7e6e0 is in history

Change-Id: I5d54abd4194a413a8130e6cc7cfada672d8658ff
2020-04-07 02:57:21 +00:00
Lorenzo Colitti
04c2dd4fd8 [automerger skipped] Merge "Refactor the Nat464Xlat function for simplicity." into rvc-dev am: 672da12990 am: 5c76aad621 -s ours am: 34d04eec14 -s ours
am skip reason: Change-Id Ice536bcb269cc8b040c6e7a72c15d0bc8b5bd235 with SHA-1 3f18aa996d is in history

Change-Id: I1780588f4062a9890ef2ba46f94e06d9e598184a
2020-04-07 02:56:30 +00:00
Automerger Merge Worker
9df7265126 Merge "[automerger skipped] Merge "Refactor the Nat464Xlat function for simplicity." into rvc-dev am: 672da12990 -s ours am: deaf9677f4 -s ours" into rvc-d1-dev-plus-aosp 2020-04-07 02:37:33 +00:00
Lorenzo Colitti
4ae35796e0 [automerger skipped] Merge "Refactor the Nat464Xlat function for simplicity." into rvc-dev am: 672da12990 -s ours am: deaf9677f4 -s ours
am skip reason: Change-Id Ice536bcb269cc8b040c6e7a72c15d0bc8b5bd235 with SHA-1 3f18aa996d is in history

Change-Id: I67f2aa65a97322ae21c0d97cba2bafaf4ff32aae
2020-04-07 02:37:28 +00:00
Lorenzo Colitti
34d04eec14 [automerger skipped] Merge "Refactor the Nat464Xlat function for simplicity." into rvc-dev am: 672da12990 am: 5c76aad621 -s ours
am skip reason: Change-Id Ice536bcb269cc8b040c6e7a72c15d0bc8b5bd235 with SHA-1 3f18aa996d is in history

Change-Id: I8c089ff672fc8f986adcc79e79ba92105f966fd0
2020-04-07 02:37:26 +00:00
Lorenzo Colitti
5c76aad621 Merge "Refactor the Nat464Xlat function for simplicity." into rvc-dev am: 672da12990
Change-Id: Ia2e41676b853300ba6c8e72827dc9ab2b58da58c
2020-04-07 02:16:23 +00:00
Lorenzo Colitti
deaf9677f4 [automerger skipped] Merge "Refactor the Nat464Xlat function for simplicity." into rvc-dev am: 672da12990 -s ours
am skip reason: Change-Id Ice536bcb269cc8b040c6e7a72c15d0bc8b5bd235 with SHA-1 3f18aa996d is in history

Change-Id: I27d77c0e0cc88c015cfe1012d4b83a1159b1b05b
2020-04-07 02:15:47 +00:00
Lorenzo Colitti
672da12990 Merge "Refactor the Nat464Xlat function for simplicity." into rvc-dev 2020-04-07 02:13:33 +00:00
Maciej Zenczykowski
c8d904f412 [automerger skipped] Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." into rvc-dev am: e7d685f488 am: 75cb2c3a02 -s ours am: a76c2330d9 -s ours
am skip reason: Change-Id Ia9a09a708870827b1e4cf068f930fa9542dd116c with SHA-1 b5a18f3d93 is in history

Change-Id: Idff24a949f33cf6b7484e17c1c4112de773177d6
2020-04-07 01:00:21 +00:00
Maciej Zenczykowski
77a89a4d35 [automerger skipped] Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." into rvc-dev am: e7d685f488 -s ours am: c6aef05296 -s ours am: 38d3a8a973 -s ours
am skip reason: Change-Id Ia9a09a708870827b1e4cf068f930fa9542dd116c with SHA-1 fff75393c5 is in history

Change-Id: I51f9e4bdf9d4e7f2bedeb22a8d409e4fb0f1179f
2020-04-07 00:59:35 +00:00
Maciej Zenczykowski
a76c2330d9 [automerger skipped] Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." into rvc-dev am: e7d685f488 am: 75cb2c3a02 -s ours
am skip reason: Change-Id Ia9a09a708870827b1e4cf068f930fa9542dd116c with SHA-1 b5a18f3d93 is in history

Change-Id: Ic85370f7dd42d5c3b38058363538b9563d6acce8
2020-04-07 00:28:15 +00:00
Maciej Zenczykowski
38d3a8a973 [automerger skipped] Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." into rvc-dev am: e7d685f488 -s ours am: c6aef05296 -s ours
am skip reason: Change-Id Ia9a09a708870827b1e4cf068f930fa9542dd116c with SHA-1 fff75393c5 is in history

Change-Id: I605e7b6f6f1a63b90cf48f2ceba7778aa8571e90
2020-04-07 00:27:54 +00:00
Maciej Zenczykowski
c6aef05296 [automerger skipped] Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." into rvc-dev am: e7d685f488 -s ours
am skip reason: Change-Id Ia9a09a708870827b1e4cf068f930fa9542dd116c with SHA-1 fff75393c5 is in history

Change-Id: I4646da7aaeb7844ef2c0dc9e3a15b15607f095ea
2020-04-06 23:59:33 +00:00