joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity
65,382 commits 1 branch 0 tags 204 MiB
Commit graph android_packages_modules_Co.../Tethering
Message SHA1
Merge "Use frameworks/libs/net version of SharedLog" am: d5c6a891b4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2129981

Change-Id: I7ea6d753680102d1440e6b24d37a136d3ff4225b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Xiao Ma   authored and   Automerger Merge Worker   commited 2022-07-08 07:16:54 +00:00
7ca4bb0c7f
Merge "Use frameworks/libs/net version of SharedLog"
Xiao Ma   authored and   Gerrit Code Review   commited 2022-07-08 06:55:04 +00:00
d5c6a891b4
Merge "Setting apex version to the placeholder value" am: 0dce8e551e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2143792

Change-Id: I7521ccebf1dac704b6081989c32b07b4bf09a98c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-07-08 02:45:15 +00:00
e4c50fa0fa
Merge "Setting apex version to the placeholder value"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-07-08 02:27:29 +00:00
0dce8e551e
Use frameworks/libs/net version of SharedLog 
Test: m
Bug: 235901424
Change-Id: Ibfa7821c68c41036a47e765f15078cd5d195afb8

Patrick Rohr   commited 2022-07-07 12:52:58 -07:00
b873e25ab4
Setting apex version to the placeholder value 
When the apex version is set to 0, the version number will be replaced by the build system to the default value for the current branch.
The default value for mainline module manifest version is stored in the defaultManifestVersion constant: https://android.googlesource.com/platform/build/soong/+/refs/heads/master/apex/constants.go#36

The version should not be changed manually in the manifest. Release tooling will set this version to the release version on the release branches.

Test: presubmit
Bug: 231691643
Change-Id: I30b5b486bca521ebdeed17dba7afc61f2c529ab8
Merged-In: I30b5b486bca521ebdeed17dba7afc61f2c529ab8

Alexei Nicoara   commited 2022-07-07 11:29:39 +01:00
b02a2266cd
Merge "Use BpfDump.toBase64EncodedString to dump raw map" am: bf28a595f2 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2133440

Change-Id: Ie93ca0ae78bff00eea862a7670145b5e51773ee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Nucca Chen   authored and   Automerger Merge Worker   commited 2022-07-06 12:22:02 +00:00
1ebaa587ba
Merge "Use BpfDump.toBase64EncodedString to dump raw map"
Nucca Chen   authored and   Gerrit Code Review   commited 2022-07-06 12:04:54 +00:00
bf28a595f2
Merge "Move struct {Clat*, Tether4*, TetherStats*} to connectivity module" am: 7722b024a1 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2138535

Change-Id: I58c76123da5c986c6c86bdb545ea358fa6836c4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-07-04 12:31:02 +00:00
851d4311ec
Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master
Xin Li   authored and   Android (Google) Code Review   commited 2022-06-29 21:22:03 +00:00
514698c728
Move struct {Clat*, Tether4*, TetherStats*} to connectivity module 
Needed because these struct classes should not be exposed.
Only used for the connectivity module and its tests.

Bug: 234160319
Test: atest ConnectivityCoverageTests

The moved files are identical.

diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatEgress4Key.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatEgress4Key.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatEgress4Value.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatEgress4Value.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatIngress6Key.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatIngress6Key.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatIngress6Value.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatIngress6Value.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/Tether4Key.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/Tether4Key.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/Tether4Value.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/Tether4Value.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/TetherStatsKey.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/TetherStatsKey.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/TetherStatsValue.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/TetherStatsValue.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatEgress4Key.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatEgress4Key.java
(no diff)

Change-Id: I4ce8045150bdbf04c63c5262c58a0ebcc30d395c

Hungming Chen   authored and   Nucca Chen   commited 2022-06-29 11:34:19 +00:00
01f2550ac4
Merge "Ignore BPF tethering offload test if tether config is disabled"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-06-29 07:57:56 +00:00
dd9a89c2f2
Merge "Fix metrics doesn't work if multiple tethering requested"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-06-29 03:39:03 +00:00
b7c368c27f
Merge tm-dev-plus-aosp-without-vendor@8763363 
Bug: 236760014
Merged-In: Ic05ca7fe4adaa94f79e59758569f7595ab4c4f54
Change-Id: Id2ed4b3865be3c959c4cb62a31fba318f5b6fd77

Xin Li   commited 2022-06-28 21:23:32 +00:00
e9ece30105
Merge "Tethering: remove dead code"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-06-28 13:00:01 +00:00
abc0246c4f
Fix metrics doesn't work if multiple tethering requested 
There is a bug in TetheringMetrics that the on-going builders would be
cleared when creating new builder. This means if multiple tethering
created at the same time, only latest tethering would have metrics.

Bug: 153942334
Test: atest TetheringTests
Change-Id: I16a66790bc19072d8ffe570348bcbafa91263573

Mark   authored and   Mark Chien   commited 2022-06-28 10:31:02 +00:00
26cf9b6728
Tethering: remove dead code 
changeInterfaceState only used in enableIpServing which always
pass STATE_TETHERED or STATE_LOCAL_ONLY state. Move it into
enableIpServing directly and remove unused code.

Test: m
Change-Id: I2d91115e588a153ddcb9d61f8e2bc09a09c52d48

Mark   authored and   Mark Chien   commited 2022-06-28 06:46:27 +00:00
133299a9b8
Ignore BPF tethering offload test if tether config is disabled 
Needed because OEM can disable BPF offload by PRO.

Bug: 237144191
Bug: 236925089
Test: atest EthernetTetheringTest
Change-Id: Idf965caa44aeaae1f084d2c4fcd516a352c1b138

Hungming Chen   commited 2022-06-27 15:11:23 +08:00
b37f76f28e
Use BpfDump.toBase64EncodedString to dump raw map 
Move base64 related bpf map function and constant to f/l/n.
This is preparation for testing BPF map in ClatCoordinator.

Test: atest EthernetTetheringTest
Change-Id: Ieb1e0a0f128c9aa0d7c9f043e90eecf3c61252f5

Hungming Chen   commited 2022-06-23 21:42:20 +08:00
264cac59bb
Merge "Fix linker error with upstream llvm" am: ce11dc9a2d am: 2a7549201a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2133158

Change-Id: Icfc754eb367de1fe69f529762c84de4d35ff5de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-22 08:46:00 +00:00
d2ca788472
Fix linker error with upstream llvm 
https://reviews.llvm.org/rGd07ff995917 changed behaviour of lld and is
no longer accepting single dash `-error-limit`. Update to the new flag
format.

Test: presubmit
Change-Id: I7a78128c56157414411d085086091b9d25be0186

Yi Kong   commited 2022-06-21 19:45:01 +00:00
20a996e1e1
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>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-14 16:50:02 +00:00
b825843c28
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>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-14 12:42:28 +00:00
49cf892d4c
[TestOnly] Use probeV4TetheringConnectivity in getClatIpv6Address 
Test: atest EthernetTetheringTest
Change-Id: Ib741e4f9cd452c7ce37e829210d30046a9f391ef

Mark   commited 2022-06-14 04:38:33 +00:00
06238c1aa6
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>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-13 12:40:53 +00:00
41861a9d19
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>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-13 12:40:43 +00:00
02a5082250
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>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-13 12:30:19 +00:00
08f941b8f3
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>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-13 12:21:56 +00:00
5113e59c31
[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

Mark   commited 2022-06-13 09:01:53 +00:00
01971ad969
[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

Mark   commited 2022-06-13 09:01:42 +00:00
73284988cd
[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

Mark Chien   authored and   Mark   commited 2022-06-13 09:00:27 +00:00
03693623c1
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>

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2022-06-09 02:24:27 +00:00
3d40dad1f6
Merge "Remove NetworkPermissionConfig package"
Motomu Utsumi   authored and   Gerrit Code Review   commited 2022-06-09 01:24:19 +00:00
2111cc0749
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>

Mark Chien   authored and   Automerger Merge Worker   commited 2022-06-08 03:46:16 +00:00
4b5dcd42ab
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>

Mark Chien   authored and   Automerger Merge Worker   commited 2022-06-08 02:41:29 +00:00
1d5d7a3baf
Merge "[TestOnly] Replace isRouterAdvertisement with isIcmpv6Type"
Mark Chien   authored and   Gerrit Code Review   commited 2022-06-08 02:15:53 +00:00
4fcf168399
[TestOnly] Replace isRouterAdvertisement with isIcmpv6Type 
Test: atest EthernetTetheringTest
Change-Id: I5dca7a05a982139d8fc6f8272c8b829b74a34722

Mark   commited 2022-06-07 15:29:34 +00:00
6078d6edd6
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>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-03 08:00:20 +00:00
aa4879b4b3
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>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-03 07:35:13 +00:00
6fb9ac709c
Merge changes from topic "roll_forward_testtetherclatudp" 
* changes:
  Skip testTetherClatUdp before S
  Revert "Revert "EthernetTetheringTest: add testTetherClatUdp""

Treehugger Robot   authored and   Gerrit Code Review   commited 2022-06-03 07:21:01 +00:00
9b51a75d6e
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>

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-06-03 03:49:14 +00:00
9f4f196731
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>

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-06-03 03:23:45 +00:00
8006de1eca
Skip testTetherClatUdp before S 
The test does not pass on R.

Bug: 234727688
Test: atest EthernetTetheringTest
Change-Id: I831859e521b026ed4acb84de5857a7d3ec318ba5

Remi NGUYEN VAN   commited 2022-06-03 12:04:23 +09:00
8b56874caa
Revert "Revert "EthernetTetheringTest: add testTetherClatUdp"" 
This reverts commit 5bbd292bed.

Bug: 215655463
Change-Id: I06490001b06446b6a4ff3dc084ce11e8ebbe17f8
Test: atest ConnectivityCoverageTests

Remi NGUYEN VAN   commited 2022-06-03 02:55:26 +00:00
e78cfa130b
Merge "Revert "EthernetTetheringTest: add testTetherClatUdp""
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2022-06-03 02:54:39 +00:00
a100d7c51e
Revert "EthernetTetheringTest: add testTetherClatUdp" 
This reverts commit b0274cf796.

Reason for revert: Breaks presubmit: b/234727688

Change-Id: I736752dca3707588a525f28d208bdb20f7280972

Remi NGUYEN VAN   commited 2022-06-03 02:32:48 +00:00
5bbd292bed
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>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-02 06:27:51 +00:00
d755b3e4d8
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>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-02 06:11:38 +00:00
8b3ac26c18
Merge "EthernetTetheringTest: add testTetherClatUdp"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-06-02 05:57:05 +00:00
8968739285
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>

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-06-02 04:56:21 +00:00
a76f1ca141