Commit Graph

2514 Commits

Author SHA1 Message Date
Treehugger Robot
b825843c28 Merge "[TestOnly] Use probeV4TetheringConnectivity in getClatIpv6Address" am: 1ba05608e5 am: 49cf892d4c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116493

Change-Id: Ic9d0654d80aee41f454e6ebbe4104f4c3562dd8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 16:50:02 +00:00
Treehugger Robot
49cf892d4c Merge "[TestOnly] Use probeV4TetheringConnectivity in getClatIpv6Address" am: 1ba05608e5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116493

Change-Id: Ifaa19166d2fa8db31a62547e19f2a3aa2a6a6b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 12:42:28 +00:00
Mark
06238c1aa6 [TestOnly] Use probeV4TetheringConnectivity in getClatIpv6Address
Test: atest EthernetTetheringTest
Change-Id: Ib741e4f9cd452c7ce37e829210d30046a9f391ef
2022-06-14 04:38:33 +00:00
Treehugger Robot
41861a9d19 Merge changes Iade99eeb,I3ede46f5 am: 0c0cbd3c04 am: 08f941b8f3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116175

Change-Id: Ibb5dcaf0152f95efd6b3a8b866992bd3c6a2367f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 12:40:53 +00:00
Treehugger Robot
02a5082250 Merge "[TestOnly]Remove RemoteResponder from TetheringTester" am: e236ea7c63 am: 5113e59c31
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2115077

Change-Id: Ia2b5b1d74dca100173f1ddd5f7523672e39d7032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 12:40:43 +00:00
Treehugger Robot
08f941b8f3 Merge changes Iade99eeb,I3ede46f5 am: 0c0cbd3c04
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116175

Change-Id: Iee24c11be3b23cd75a11c465ef6225a7f5411387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 12:30:19 +00:00
Treehugger Robot
5113e59c31 Merge "[TestOnly]Remove RemoteResponder from TetheringTester" am: e236ea7c63
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2115077

Change-Id: Iab0f168d7863ace9a268788e4674ebe47e87aaa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 12:21:56 +00:00
Mark
01971ad969 [TestOnly]Create TetheringTester in initTetheringTester
If tethering's upstream have ipv6, the #initTetheringTester
would make sure ipv6 tethering connectivity is ready for testing.

Test: atest EthernentTetheringTest

Change-Id: Iade99eeb95fa94483248799eb852a81662bbb1e0
2022-06-13 09:01:53 +00:00
Mark
73284988cd [TestOnly] Move isExpectedUdpPacket into TetheringTester
isExpectedUdpPacket and isIcmpv6Type is similar util, put them in the
same place and have isExpectedIpPacket to share the ip/eth parsing code.

Test: atest EthernetTetheringTest
Change-Id: I3ede46f5ff1799f575fad7aca277f2bc0bf6c391
2022-06-13 09:01:42 +00:00
Mark Chien
03693623c1 [TestOnly]Remove RemoteResponder from TetheringTester
This is no-op change. Originally RemoteResponder design for providing a
base responder that user could extend it like DnsServerResponder,
TcpResponder, UdpResponder. But actually user could just simply extend
TetheringTester that make RemoteResponder useless. Thus, remove it to
simply the code.

Test: atest EthernetTetheringTest
Change-Id: I47b22a1460ca312c678778143033aadf5e3e0b82
2022-06-13 09:00:27 +00:00
Motomu Utsumi
3d40dad1f6 Merge "Remove NetworkPermissionConfig package" am: 2111cc0749
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2111165

Change-Id: I598c6fa1931f5e066c9484504dfbb607e90c230e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:24:27 +00:00
Motomu Utsumi
2111cc0749 Merge "Remove NetworkPermissionConfig package" 2022-06-09 01:24:19 +00:00
Mark Chien
4b5dcd42ab Merge "[TestOnly] Replace isRouterAdvertisement with isIcmpv6Type" am: 4fcf168399 am: 1d5d7a3baf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116177

Change-Id: Id2285c2a50520f464911f3c5c7010e39781a77a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:46:16 +00:00
Mark Chien
1d5d7a3baf Merge "[TestOnly] Replace isRouterAdvertisement with isIcmpv6Type" am: 4fcf168399
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116177

Change-Id: Idf8f6a064cd09a912c1b2e0e1e2cec5db33fee8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 02:41:29 +00:00
Mark Chien
4fcf168399 Merge "[TestOnly] Replace isRouterAdvertisement with isIcmpv6Type" 2022-06-08 02:15:53 +00:00
Mark
6078d6edd6 [TestOnly] Replace isRouterAdvertisement with isIcmpv6Type
Test: atest EthernetTetheringTest
Change-Id: I5dca7a05a982139d8fc6f8272c8b829b74a34722
2022-06-07 15:29:34 +00:00
Treehugger Robot
aa4879b4b3 Merge changes from topic "roll_forward_testtetherclatudp" am: 9b51a75d6e am: 6fb9ac709c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116174

Change-Id: I6ad9045aa021ae791fadd925c27734de8871677a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 08:00:20 +00:00
Treehugger Robot
6fb9ac709c Merge changes from topic "roll_forward_testtetherclatudp" am: 9b51a75d6e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116174

Change-Id: Ice9f5295f4571ed218fbcf3693e495db898cfb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 07:35:13 +00:00
Treehugger Robot
9b51a75d6e Merge changes from topic "roll_forward_testtetherclatudp"
* changes:
  Skip testTetherClatUdp before S
  Revert "Revert "EthernetTetheringTest: add testTetherClatUdp""
2022-06-03 07:21:01 +00:00
Remi NGUYEN VAN
9f4f196731 Merge "Revert "EthernetTetheringTest: add testTetherClatUdp"" am: a100d7c51e am: 8006de1eca
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116153

Change-Id: I8e23bf28787176ef556db067245e0af0215a6b50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 03:49:14 +00:00
Remi NGUYEN VAN
8006de1eca Merge "Revert "EthernetTetheringTest: add testTetherClatUdp"" am: a100d7c51e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116153

Change-Id: Ib918a1798ded1ae1eba92ce8e16d010da817d843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 03:23:45 +00:00
Remi NGUYEN VAN
8b56874caa Skip testTetherClatUdp before S
The test does not pass on R.

Bug: 234727688
Test: atest EthernetTetheringTest
Change-Id: I831859e521b026ed4acb84de5857a7d3ec318ba5
2022-06-03 12:04:23 +09:00
Remi NGUYEN VAN
e78cfa130b Revert "Revert "EthernetTetheringTest: add testTetherClatUdp""
This reverts commit 5bbd292bed.

Bug: 215655463
Change-Id: I06490001b06446b6a4ff3dc084ce11e8ebbe17f8
Test: atest ConnectivityCoverageTests
2022-06-03 02:55:26 +00:00
Remi NGUYEN VAN
a100d7c51e Merge "Revert "EthernetTetheringTest: add testTetherClatUdp"" 2022-06-03 02:54:39 +00:00
Remi NGUYEN VAN
5bbd292bed Revert "EthernetTetheringTest: add testTetherClatUdp"
This reverts commit b0274cf796.

Reason for revert: Breaks presubmit: b/234727688

Change-Id: I736752dca3707588a525f28d208bdb20f7280972
2022-06-03 02:32:48 +00:00
Treehugger Robot
d755b3e4d8 Merge "EthernetTetheringTest: add testTetherClatUdp" am: 8968739285 am: 8b3ac26c18
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2110088

Change-Id: I35f183f4d94d36a0bece972b80b9e80e42b266cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:27:51 +00:00
Treehugger Robot
8b3ac26c18 Merge "EthernetTetheringTest: add testTetherClatUdp" am: 8968739285
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2110088

Change-Id: I86030a3a3b6e504fa0ec84b09d68d598b39e5228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:11:38 +00:00
Treehugger Robot
8968739285 Merge "EthernetTetheringTest: add testTetherClatUdp" 2022-06-02 05:57:05 +00:00
Remi NGUYEN VAN
a76f1ca141 Merge "Fix jarjar rules for tethering apk" am: cce6a8bc0a am: 9f5d406ae7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2110095

Change-Id: I5fedd823b9fc2f7384511a1d465f2c00460a63fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 04:56:21 +00:00
Remi NGUYEN VAN
9f5d406ae7 Merge "Fix jarjar rules for tethering apk" am: cce6a8bc0a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2110095

Change-Id: If458b1f455c90e20d8130686040b6d59c3ce184a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 04:24:23 +00:00
Hungming Chen
b0274cf796 EthernetTetheringTest: add testTetherClatUdp
Bug: 215655463
Test: atest ConnectivityCoverageTests
Change-Id: Id5d237b96b1d171c1e353cfd0aeba5aa4606fcc7
2022-06-02 12:07:13 +08:00
Remi NGUYEN VAN
cce6a8bc0a Merge "Fix jarjar rules for tethering apk" 2022-06-02 04:06:24 +00:00
Mark Chien
be6a57ba53 Merge "Add tethering icmpv6 forwarding test" am: 86a800f911 am: 2afb2c4c35
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1817920

Change-Id: I70ee7712a2d8394153df23feeab982dde6e1202d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 16:10:05 +00:00
Mark Chien
2afb2c4c35 Merge "Add tethering icmpv6 forwarding test" am: 86a800f911
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1817920

Change-Id: I1e50559c47fa1ed32207b72d0be9cad00887381e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 15:44:43 +00:00
Mark Chien
86a800f911 Merge "Add tethering icmpv6 forwarding test" 2022-06-01 15:15:37 +00:00
Treehugger Robot
7e2353413f Merge "Bump tethering target sdk to 33" am: d10244feb8 am: 7462a6ce66
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2100995

Change-Id: I23e72a0ad93e21dcbcbd059fecc09334a24a1a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 09:09:31 +00:00
Treehugger Robot
7462a6ce66 Merge "Bump tethering target sdk to 33" am: d10244feb8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2100995

Change-Id: I838330510fc334a11e5a2238c212dcfa901ae67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 09:07:45 +00:00
Treehugger Robot
d10244feb8 Merge "Bump tethering target sdk to 33" 2022-06-01 08:57:46 +00:00
Motomu Utsumi
ae27901118 Remove NetworkPermissionConfig package
Move declaration of MAINLINE_NETWORK_STACK permission from the
NetworkPermissionConfig package to the NetworkStack package.

Bug: 223649084
Test: m

(cherry picked from f2bf0335cd)
Merged-In: I7d0565d366892f18dfc510ccbbdbf1eab6f1932a
Merged-In: I1bb172919db1368e1b0a6560d63dc9e35686f89e

Change-Id: I2f8ac1a31b053803bf1b46b4cfcfbf297b8ebec3
2022-06-01 02:55:22 +00:00
markchien
a40f2fe746 Add tethering icmpv6 forwarding test
Bug: 183166581
Test: atest EthernetTetheringTest

Change-Id: I77ad4a468530f3ef834cd7b72e585798a23f64c3
2022-05-31 23:53:47 +08:00
Alexei Nicoara
90fc13ae8b Merge "Bump Mainline Module Version Codes in AOSP to 339990000" am: 7884a2f2b8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2092626

Change-Id: Iafa53550c6879311fa8db3b54cc853b4c366bba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 14:35:39 +00:00
Alexei Nicoara
7884a2f2b8 Merge "Bump Mainline Module Version Codes in AOSP to 339990000" 2022-05-31 14:17:23 +00:00
Mark Chien
8ff2a83662 Fix jarjar rules for tethering apk
Jarjar android.util.IndentingPrintWriter and
android.hidl.base.V1_0.DebugInfo to a unique tethering specific
package name.

Bug: 233961539
Test: atest CtsTetheringTest
      Use apktool to unzip tethering apk and checking the result
Change-Id: I564255ec8478a0385c389340da94f6ffadb66479
2022-05-31 15:20:52 +08:00
Mark Chien
d25a1e05ae Bump tethering target sdk to 33
Note: to avoid missing some dependeices change only happen in T+, below
testing verification is perform by internal branch.

Test: atest TetheringTests
      atest TetheringIntegrationTests
      atest CtsTetheringTest
      atest MtsTetheringLatestSdk
      manually change entitlement check recheck period to 1 min and
      monitor schedule alarm works.
      Dogfood this change personally 7 days, major use hotspot sharing network to notebook to work.
Bug: 232193147
Change-Id: I3cba98f42ac1a9c0c1db4b2ad036aff714a428f3
2022-05-31 03:31:18 +00:00
Treehugger Robot
dbdb3adc2e Merge "Test testTetherUdpV4AfterR only verify bpf in precise kernel range" am: 875daa69eb am: e714310a20
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2108068

Change-Id: I7098539cba5880b984a9569c54e6e4d5adb85f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 19:39:17 +00:00
Treehugger Robot
e714310a20 Merge "Test testTetherUdpV4AfterR only verify bpf in precise kernel range" am: 875daa69eb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2108068

Change-Id: I12bad86d8a0ea584527eeebfdf823573fa0c6f98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 19:20:57 +00:00
Treehugger Robot
875daa69eb Merge "Test testTetherUdpV4AfterR only verify bpf in precise kernel range" 2022-05-27 19:03:58 +00:00
Artur Satayev
ef6dbb58ac Merge "Bump version codes in tm-dev to match tm-mainline-prod" into tm-dev am: edda01a744
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/18601926

Change-Id: I7c08474b138bb7399f718d33faaf1b26c39d9cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 16:42:28 +00:00
Artur Satayev
edda01a744 Merge "Bump version codes in tm-dev to match tm-mainline-prod" into tm-dev 2022-05-27 16:16:16 +00:00
Hungming Chen
d7e713283d Test testTetherUdpV4AfterR only verify bpf in precise kernel range
Use three-part kernel version numbers to check which device
needs to verify BPF offload. Only check major and minor number
is not enough. Ex: mixed build T + R may have an unsupported kernel
version 4.19.160 (require 4.19.176+). Now check the subminor
number as well.

For UDPv4 support, kernel require 4.14.222+ 4.19.176+ 5.4.98+, 5.8.0+

Test: atest EthernetTetheringTest (raven @ internal master build)
Test: cts test (bramble @ T + R mixed build)
> run cts-on-gsi -m CtsTetheringTest -t android.net.EthernetTetheringTest#testTetherUdpV4AfterR

Bug: 232332847
Change-Id: I466df73b0fa35b086a2c5e11f8624c84eb79c8fd
2022-05-27 22:15:24 +08:00