Maciej Żenczykowski
4597b2e52e
Merge "move bpf test map into a separate file" am: ab44322f9c am: e15c4e0281 am: 866a65d07c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554234
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2dce9aedb87226fffe2805968ba4f0e08545f896
2021-01-19 12:39:59 +00:00
Junyu Lai
1c8c29d048
Merge "Revert "[VCN06.1] Add CTS for request background network"" am: f555f4bca7 am: ca80fa4a1e am: 8503663e52
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553865
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I30e50fbb696531098f6715025a41bcb0208c06fa
2021-01-19 12:39:27 +00:00
Maciej Żenczykowski
866a65d07c
Merge "move bpf test map into a separate file" am: ab44322f9c am: e15c4e0281
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554234
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I92792b09a33e78a86ecaa96a70654a3bca181335
2021-01-19 12:00:00 +00:00
Junyu Lai
8503663e52
Merge "Revert "[VCN06.1] Add CTS for request background network"" am: f555f4bca7 am: ca80fa4a1e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553865
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I37e01d79431275c91b4eb51f62e701a9bcb64af1
2021-01-19 11:59:37 +00:00
Maciej Żenczykowski
e15c4e0281
Merge "move bpf test map into a separate file" am: ab44322f9c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554234
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic714fbc7a1f61b29d4967b85415c00c2700df51b
2021-01-19 11:38:24 +00:00
Junyu Lai
ca80fa4a1e
Merge "Revert "[VCN06.1] Add CTS for request background network"" am: f555f4bca7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553865
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iacfe73e36cc6fe4068291af7391612ae725606a1
2021-01-19 11:34:18 +00:00
Maciej Żenczykowski
ab44322f9c
Merge "move bpf test map into a separate file"
2021-01-19 11:25:13 +00:00
Junyu Lai
f555f4bca7
Merge "Revert "[VCN06.1] Add CTS for request background network""
2021-01-19 10:24:47 +00:00
Junyu Lai
3660b71c11
Revert "[VCN06.1] Add CTS for request background network"
...
Revert "[VCN06] Support request background network"
Revert submission 1545847-vcn06
Reason for revert: b/177876289 presubmit failure
Reverted Changes:
I8042ce197:[VCN06.1] Add CTS for request background network
If9aaa87b7:[VCN06] Support request background network
Change-Id: Icd01643cae86c4448eb7105ef0f238b1f10ebc19
2021-01-19 09:06:00 +00:00
Maciej Żenczykowski
e9810ffef1
move bpf test map into a separate file
...
This allows for better separation of test vs production code:
we will add more test maps and programs here later.
Test: builds
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I7b22e3e148ebf43fdf43dc68d0dea354f7627688
2021-01-18 18:36:00 -08:00
Junyu Lai
bf89d02ae1
Merge "[VCN06.1] Add CTS for request background network" am: 5b39b66544 am: 024c657139 am: 30d41852dd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552050
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1ff56b63b3151ecaad27a020c2100b25d16e82a4
2021-01-19 01:50:31 +00:00
Junyu Lai
30d41852dd
Merge "[VCN06.1] Add CTS for request background network" am: 5b39b66544 am: 024c657139
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552050
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2db4538b433c710acffd6e427571acdcd8082def
2021-01-19 01:34:53 +00:00
Junyu Lai
024c657139
Merge "[VCN06.1] Add CTS for request background network" am: 5b39b66544
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552050
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3568a450c50af90c194e9c563f26f21d5067b360
2021-01-19 01:12:58 +00:00
Junyu Lai
5b39b66544
Merge "[VCN06.1] Add CTS for request background network"
2021-01-19 01:04:20 +00:00
junyulai
f8370c08be
[VCN06.1] Add CTS for request background network
...
Test: android.net.cts.ConnectivityManagerTest#testRequestBackgroundNetwork
Bug: 175662146
Change-Id: I8042ce1971c728a9f900d090c0c4cabd994820bf
2021-01-18 16:32:33 +08:00
Nucca Chen
071607ba28
Merge "[NFCT.TETHER.2] Migrate tetherOffloadRuleAdd from netd to mainline" am: 6bc18e6d2c am: 79f0ca8849 am: 0f360d1d11
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1536562
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifebd26d45f2be22e7ec8b0936aeb9d102e2d3c26
2021-01-18 08:20:27 +00:00
Nucca Chen
0f360d1d11
Merge "[NFCT.TETHER.2] Migrate tetherOffloadRuleAdd from netd to mainline" am: 6bc18e6d2c am: 79f0ca8849
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1536562
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9e3adfd593a190d97a72d591359e06d6a31d0bde
2021-01-18 07:21:10 +00:00
Nucca Chen
79f0ca8849
Merge "[NFCT.TETHER.2] Migrate tetherOffloadRuleAdd from netd to mainline" am: 6bc18e6d2c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1536562
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5a1d3871bf767043cc2845811aef33fc838ac017
2021-01-18 07:05:40 +00:00
Nucca Chen
6bc18e6d2c
Merge "[NFCT.TETHER.2] Migrate tetherOffloadRuleAdd from netd to mainline"
2021-01-18 06:37:23 +00:00
Les Lee
9edd34ee20
Merge "wifi: Add bridged pre-fix for tethering interface" am: 7e9e19c1ea am: 8f9ffbb097 am: 46116ca234
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542725
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie54503ed9fc92fbda08316859183c82f1c1846ef
2021-01-18 02:57:22 +00:00
Les Lee
46116ca234
Merge "wifi: Add bridged pre-fix for tethering interface" am: 7e9e19c1ea am: 8f9ffbb097
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542725
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I25fd5ec86c1c25bcaa4c4bbe5337d8027dff88ad
2021-01-18 02:42:45 +00:00
Les Lee
8f9ffbb097
Merge "wifi: Add bridged pre-fix for tethering interface" am: 7e9e19c1ea
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542725
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1ff84ff6d02ddd20c6ae73c194378ed6a96338cd
2021-01-18 01:58:04 +00:00
Les Lee
7e9e19c1ea
Merge "wifi: Add bridged pre-fix for tethering interface"
2021-01-18 01:21:45 +00:00
lesl
6a953ef4d3
wifi: Add bridged pre-fix for tethering interface
...
In bridged mode, the tethered interface will include the prefix ap_br_
Bug: 162686273
Test: Manual Test - bridged AP enabled success
and client can connected it and get the IP address
Test: atest -c NetworkStackTests
Test: atest -c FrameworksNetTests
Test: atest -c CtsNetTestCasesLatestSdk
Change-Id: I89ae178c658a42f902199afaed89ec798de54643
2021-01-18 01:21:32 +00:00
Remi NGUYEN VAN
1acf96eb96
Skip NetworkAgentTest on R- am: 4bf203d065 am: 6bc4e3c9db am: 3dec2a082d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552215
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib28303a626d3f4bea9aa1431d6c2d553d85f27a2
2021-01-15 10:18:57 +00:00
Remi NGUYEN VAN
3dec2a082d
Skip NetworkAgentTest on R- am: 4bf203d065 am: 6bc4e3c9db
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552215
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ied85395ab335e9ea8fff934c9581bfb02eb385c4
2021-01-15 09:51:59 +00:00
Remi NGUYEN VAN
6bc4e3c9db
Skip NetworkAgentTest on R- am: 4bf203d065
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552215
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2d5f21e51e7221b1dbbb4a104c8f09e55e323934
2021-01-15 09:17:05 +00:00
Hungming Chen
dd55b91228
[NFCT.TETHER.2] Migrate tetherOffloadRuleAdd from netd to mainline
...
A preparation for updating BPF map in mainline module.
Test: atest TetheringCoverageTests
Change-Id: I6f8667bf110dae3e2805c2752ff59e7284a7bce0
2021-01-15 17:10:58 +08:00
Remi NGUYEN VAN
4bf203d065
Skip NetworkAgentTest on R-
...
NetworkAgent is not updatable on R-, so there is no need to run tests
compiled against S on older platforms. They are also incompatible
because NetworkAgent stopped using AsyncChannel in S.
This only affects MTS, and CTS used to test S+ devices. CTS for R-
devices is already cut in a branch that this change will not merge to.
Bug: 177290955
Change-Id: I85c137a1b5fd7ef701fba4623566df5a8fb707a3
Test: atest CtsNetTestCasesLatestSdk
2021-01-15 07:45:29 +00:00
Maciej Żenczykowski
41309558d9
Merge "Use header module bpf_syscall_wrappers" am: 539d0e27cf am: 034c6c7d12 am: 8cd034fd8e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1549715
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf71b838bb4f2626e277351ea729a58b215551f6
2021-01-14 09:06:02 +00:00
Maciej Żenczykowski
8cd034fd8e
Merge "Use header module bpf_syscall_wrappers" am: 539d0e27cf am: 034c6c7d12
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1549715
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie3a1ff6efba86ef3fb3d554b1807448aa56b4956
2021-01-14 08:27:24 +00:00
Maciej Żenczykowski
034c6c7d12
Merge "Use header module bpf_syscall_wrappers" am: 539d0e27cf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1549715
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib8eb6814c2000a5a015f0656030e57a6e56ae9c8
2021-01-14 08:03:06 +00:00
Maciej Żenczykowski
539d0e27cf
Merge "Use header module bpf_syscall_wrappers"
2021-01-14 07:36:50 +00:00
Treehugger Robot
0b421a4b94
Merge "Net CTS: move NsdManagerTest from Wifi CTS" am: 26b0cf3261 am: d0516927eb am: abd7330b9f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1548094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7bd154f46673d052b051fc99643c92cb1645d79b
2021-01-14 05:45:19 +00:00
Treehugger Robot
abd7330b9f
Merge "Net CTS: move NsdManagerTest from Wifi CTS" am: 26b0cf3261 am: d0516927eb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1548094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4815279eb45bc9adae1fd55558e56da578e4d06e
2021-01-14 05:02:42 +00:00
Treehugger Robot
d0516927eb
Merge "Net CTS: move NsdManagerTest from Wifi CTS" am: 26b0cf3261
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1548094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I31f8d9e5b4f9b866380c2c588cdbe9f9d5b7e8dc
2021-01-14 04:41:33 +00:00
Treehugger Robot
26b0cf3261
Merge "Net CTS: move NsdManagerTest from Wifi CTS"
2021-01-14 03:51:17 +00:00
David Su
cd1851e0a2
Net CTS: move NsdManagerTest from Wifi CTS
...
NsdManagerTest is not owned by Wifi, so it doesn't
belong in Wifi CTS.
Bug: 176902925
Test: atest CtsNetTestCases
Change-Id: I8eb3cba7a3b2ff24a012cca8d3fdff173e88c69a
2021-01-14 03:47:25 +00:00
Remi NGUYEN VAN
3e6232f97f
Merge "Do not install tethering in TEST_MAPPING"
2021-01-13 12:34:48 +00:00
Remi NGUYEN VAN
c2858740c1
Do not install tethering in TEST_MAPPING
...
The current tethering module has in-progress changes in non-mainline
branches, so it cannot be installed.
Disable the tests in non-mainline branches, considering that they are
still run in mainline branches, which will contain the same tethering
code, but without the connectivity artifacts added to the tethering
apex.
Bug: 177290955
Test: TEST_MAPPING needs to be tested on the infra
Ignore-AOSP-First: This change must not go into AOSP
Change-Id: I39dd011a8baa16c9b8eb33ec2a2e4dcaedf25b76
2021-01-13 17:13:12 +09:00
Hungming Chen
400702b6bb
Use header module bpf_syscall_wrappers
...
Use the versioned header library instead of just including
the header files.
Test: atest BpfMapTest
Change-Id: Icf23dcdc051a4ead6a7c6e925159cdc27f49eac2
2021-01-13 14:31:28 +08:00
Patrick Rohr
5e5837d969
Merge "Add CTS test for Restricted Networking Mode" am: 99f6c312ef am: cf8096729f am: 137b0929c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1545724
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If63b8475d1353a4309baad19488b8ee1a9ec54ad
2021-01-12 21:03:41 +00:00
Patrick Rohr
137b0929c8
Merge "Add CTS test for Restricted Networking Mode" am: 99f6c312ef am: cf8096729f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1545724
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I47fac7778b09cd87b80e1a760f49b66efd4bd584
2021-01-12 20:48:21 +00:00
Patrick Rohr
cf8096729f
Merge "Add CTS test for Restricted Networking Mode" am: 99f6c312ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1545724
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iee0461ea66a212db9cef6d2676742c707e567a95
2021-01-12 20:34:22 +00:00
Patrick Rohr
99f6c312ef
Merge "Add CTS test for Restricted Networking Mode"
2021-01-12 17:41:19 +00:00
Hungming Chen
7a70d825db
Follow-up CL to the change at aosp/1498277 am: 7d05e6fddd am: 0276690274 am: d40aa01f07
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1547695
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia79c2d0f20241af73149cec27ff2d16c24cc3758
2021-01-12 15:14:45 +00:00
Hungming Chen
d40aa01f07
Follow-up CL to the change at aosp/1498277 am: 7d05e6fddd am: 0276690274
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1547695
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibef2b8d76779536b28c42d421c24516d94cee826
2021-01-12 14:59:23 +00:00
Hungming Chen
0276690274
Follow-up CL to the change at aosp/1498277 am: 7d05e6fddd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1547695
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic5be309b537bcfaa0bee44623164153da8575c96
2021-01-12 14:39:20 +00:00
Hungming Chen
7d05e6fddd
Follow-up CL to the change at aosp/1498277
...
1. Correct the API annotation.
2. The entry deletion failure causes the exception in cleanTestMap().
3. Use AtomicInteger to be the counter in the lambda.
Test: atest BpfMapTest
Change-Id: I4a56038881a38bda993ef5303b71f0e2a99f03d1
2021-01-12 19:08:15 +08:00
Nucca Chen
adfb2526bc
Merge "Provide a easy way to access bpf maps from java" am: 12067258b2 am: 5a90ec8297 am: f9e96b9ce9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1498277
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib1a990bdc66510c3c9c7e87715adb59b581d3c1c
2021-01-12 09:37:33 +00:00