Commit Graph

3235 Commits

Author SHA1 Message Date
Jean Chalard
c2ea2f177a Merge "Add a routing coordinator class" into main am: 4e47533688 am: 5b0ebeabeb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2729133

Change-Id: I089082eef7745f95180b1e863dbd9166a51f523f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 10:14:06 +00:00
Jean Chalard
5b0ebeabeb Merge "Add a routing coordinator class" into main am: 4e47533688
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2729133

Change-Id: Ibadbe0c4cf62a148d7051a162bfd86a3b047252e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 09:46:03 +00:00
Jean Chalard
4e47533688 Merge "Add a routing coordinator class" into main 2023-10-25 09:13:16 +00:00
Mark Chien
deaca3084a Merge "Fix testRequestDownstreamAddressWithoutUsingLastAddress flaky" into main am: cc26d678f2 am: 2af81f2a13
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2787876

Change-Id: I1fdcbc757c3378ffb433a6a07d8430021eadb00c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 04:37:28 +00:00
Mark Chien
2af81f2a13 Merge "Fix testRequestDownstreamAddressWithoutUsingLastAddress flaky" into main am: cc26d678f2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2787876

Change-Id: Icb4a6912efa4d5ce737f9f0503228b7b690c98ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 04:10:42 +00:00
Mark Chien
cc26d678f2 Merge "Fix testRequestDownstreamAddressWithoutUsingLastAddress flaky" into main 2023-10-25 03:41:10 +00:00
Chalard Jean
2fb66f1b28 Add a routing coordinator class
Test: In followup changes : RoutingCoordinatorManagerTest
Change-Id: Ia6811d614e02123a072c7638291828745abae051
2023-10-24 22:12:26 +09:00
Mark Chien
d08dd6f8c5 Merge changes I427360f6,Ie6dbbe22 into main am: 66ef9d35ce am: b7fdac5553
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2749783

Change-Id: I795d82c15bc3b966f18d3294bdf291e702e82316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 07:35:01 +00:00
Mark Chien
b7fdac5553 Merge changes I427360f6,Ie6dbbe22 into main am: 66ef9d35ce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2749783

Change-Id: I12f4e2ea6c8a8342cf22c8a5f2f6006700c7a806
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 07:09:30 +00:00
Mark Chien
66ef9d35ce Merge changes I427360f6,Ie6dbbe22 into main
* changes:
  SyncSM05.1: add testMultiDepthTransition
  SyncSM05: add SyncStateMachineTest
2023-10-24 06:50:43 +00:00
Junyu Lai
962bb1788f Merge "[BR01.1] Support BpfNetMapsReader" into main am: a62eed380c am: 8f1730ebf9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2725213

Change-Id: Ice7b2b887ef365ef4c23b0518060644528ec00a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 06:20:32 +00:00
Junyu Lai
8f1730ebf9 Merge "[BR01.1] Support BpfNetMapsReader" into main am: a62eed380c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2725213

Change-Id: I0a9955e7fa9d51b423f8cd1113553dd492caf843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 06:19:04 +00:00
Mark Chien
239860a4d6 Fix testRequestDownstreamAddressWithoutUsingLastAddress flaky
The problem is that the test releases mHotspotIpServer’s prefix before testing mUsbIpServer, which means that mUsbIpServer might choose the same address as mHotspotIpServer’s.

To fix this, we need to test that mUsbIpServer and mHotspotIpServer have different addresses before calling releaseDownstream(mHotspotIpServer).

Change-Id: Id7f7bbfeda841ec9b97e24c0f11893fa37b9ef54
Test: TH
Bug: 300127195
2023-10-24 06:16:03 +00:00
Junyu Lai
626045a601 [BR01.1] Support BpfNetMapsReader
A helper class to *read* java BpfMaps. This is designed to
provide direct bpf access in the caller process through
ConnectivityManager APIs.

The change also removes any statical link to
net-utils-device-common-struct from service-connectivity.
This is because net-utils-device-common-struct is already
included in framework-connectivity. Including it again in
service-connectivity would create a r8 build fail by circular
dependency.

Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.BpfNetMapsTest
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.net.module.util.StructTest
Test: atest FrameworksNetTests:android.net.connectivity.android.net.BpfNetMapsReaderTest
Bug: 297836825
Change-Id: I7a6d2eb816d0dc7343167bddd672806b199f44fe
2023-10-23 20:11:02 +08:00
Mark
c352f3cb4e SyncSM05.1: add testMultiDepthTransition
Test: atest TetheringTests
Change-Id: I427360f6a106b001123442ccd4802290d4f13369
2023-10-23 07:34:29 +00:00
Mark
8f068a8a1e SyncSM05: add SyncStateMachineTest
A initial test for SyncStateMachine, will add more tests in the
following changes.

Test: atest SyncStateMachineTest
Change-Id: Ie6dbbe22bfef40b1675d50243d14d0a235df1e3a
2023-10-23 07:29:09 +00:00
Jean Chalard
486ef95ed0 Merge "Reapply "Simplify addRoutesToLocalNetwork calls"" into main am: dab9125464 am: df2978bdbe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2792437

Change-Id: Iaf160f221a76196de06132a3b38fb17ec2e36de7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-21 16:50:33 +00:00
Jean Chalard
df2978bdbe Merge "Reapply "Simplify addRoutesToLocalNetwork calls"" into main am: dab9125464
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2792437

Change-Id: Ia2cd630223bf0ed89e6076b08121f85a4a225c66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-21 16:28:16 +00:00
Jean Chalard
dab9125464 Merge "Reapply "Simplify addRoutesToLocalNetwork calls"" into main 2023-10-21 16:25:58 +00:00
Maciej Żenczykowski
662ea6adb2 Merge "tethering apex: add ethtool binary" into main am: edcc9425a0 am: 87f163f0fb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2787047

Change-Id: Id123d9242daa65f5e794e784fdbfeddf5b561482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 21:13:54 +00:00
Maciej Żenczykowski
87f163f0fb Merge "tethering apex: add ethtool binary" into main am: edcc9425a0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2787047

Change-Id: Iaa4a75b4d3b482d2152b95e7939b6da7bcd3e928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 20:35:46 +00:00
Maciej Żenczykowski
edcc9425a0 Merge "tethering apex: add ethtool binary" into main 2023-10-19 19:53:13 +00:00
Chalard Jean
7f2b3dabcd Reapply "Simplify addRoutesToLocalNetwork calls"
This reverts commit 316346be6e.

Change-Id: I86977f6e7a5451d037c7ea6fee5c4bc7082935ff
2023-10-18 15:50:02 +09:00
Maciej Żenczykowski
f36ccc75de tethering apex: add ethtool binary
Afterwards:
  vsoc_x86:/ # ls -lZ /apex/com.android.tethering/bin/ethtool
  -rwxr-xr-x 1 root shell u:object_r:system_file:s0  96204 1969-12-31 16:00 /apex/com.android.tethering/bin/ethtool

  vsoc_x86:/ # ldd /apex/com.android.tethering/bin/ethtool
  linux-gate.so.1 => [vdso] (0xedc4d000)
  libc++.so => /apex/com.android.tethering/lib/libc++.so (0xed309000)
  libc.so => /apex/com.android.runtime/lib/bionic/libc.so (0xed3db000)
  libdl.so => /apex/com.android.runtime/lib/bionic/libdl.so (0xed2c3000)
  libm.so => /apex/com.android.runtime/lib/bionic/libm.so (0xed286000)

Apex-Size-Increase: (verify ~100kB)
Aosp-First: it is
Previous-Platform-Support: been debug only for a while
Test-Info: builds, boots, binary works
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I1f7d12f2df2cf26476634e7eb84ca8f7622905f4
2023-10-16 17:43:59 +00:00
Anton Kulakov
817a32d37c Merge "Revert "Simplify addRoutesToLocalNetwork calls"" into main am: 673d97b919 am: 0c22e7e12a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2786124

Change-Id: I3199762a3a3b994f169d10d616f2c9391d5b1933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-14 09:32:54 +00:00
Anton Kulakov
0c22e7e12a Merge "Revert "Simplify addRoutesToLocalNetwork calls"" into main am: 673d97b919
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2786124

Change-Id: If4e8fc92ae92fb7356dcaca234404a94c0be49a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-14 08:58:42 +00:00
Anton Kulakov
316346be6e Revert "Simplify addRoutesToLocalNetwork calls"
Revert submission 2777667

Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/305187495

Reverted changes: /q/submissionid:2777667

Bug: 305187495

Change-Id: I516d40b20d775e9c61b2f825bc094329d016d0c3
2023-10-13 15:15:50 +00:00
Treehugger Robot
d2d3b5dd88 Merge "Add additional overriding methods to signature files" into main 2023-10-13 15:05:40 +00:00
Jean Chalard
f4befc0256 Merge changes I3b6ee1db,I70e13303,I6fb7dfe4 into main am: a6190bd658 am: 3f837cf542
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2777667

Change-Id: I084525445b0afab6032f91decf3910c724132f33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 10:57:12 +00:00
Jean Chalard
3f837cf542 Merge changes I3b6ee1db,I70e13303,I6fb7dfe4 into main am: a6190bd658
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2777667

Change-Id: I7c0aa8c8fff902b8585e5c09b1d571de70740f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 10:23:19 +00:00
Paul Duffin
d816fcb512 Merge "Add additional overriding methods to signature files" into udc-mainline-prod am: ec71811f1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/25033789

Change-Id: I3e2282b6cfd1c3d75bb69201c57974d5ab7b326d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-13 08:46:25 +00:00
Chalard Jean
cf70df3e9b Simplify addRoutesToLocalNetwork calls
There are only three calls to this method, and two of them
are with a list of 1 address which means it's simpler inlined.

The last call will be replaced with calls to RouteController
in a followup, meaning we addRoutesToLocalNetwork can be removed.

Test: RouterAdvertisementDaemonTest
      NetdUtilsTest
Change-Id: I3b6ee1db40f09954b336321000735a66306bf000
2023-10-13 16:19:25 +09:00
Paul Duffin
e531db3c9a Add additional overriding methods to signature files
This change adds overriding methods that are essential to compile the
stubs generated from the signature files.

More information and the background for this change is available at
go/add-overriding-one-pager.

Ignore-AOSP-First: Needs to be done in udc-mainline-prod first
Test: m checkapi
Bug: 299366704
Change-Id: Idba307148fd9afa87bfb7e0c89e00d9bd97ec204
2023-10-12 21:56:21 +00:00
Paul Duffin
b3c3f2e9d0 Add additional overriding methods to signature files
This change adds overriding methods that are essential to compile the
stubs generated from the signature files.

More information and the background for this change is available at
go/add-overriding-one-pager.

Test: m checkapi
Bug: 299366704
Change-Id: Idba307148fd9afa87bfb7e0c89e00d9bd97ec204
2023-10-12 19:21:07 +01:00
Paul Hu
762b03e045 Merge "Stop the created handler threads on the tests" into main am: 0b5d785096 am: b79fb66be2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2784088

Change-Id: I91bd1fedbb84b98a3a9f8ab4b7c0d8dc7b2307b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 08:22:06 +00:00
Paul Hu
b79fb66be2 Merge "Stop the created handler threads on the tests" into main am: 0b5d785096
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2784088

Change-Id: I2e9a1ab99077c3e6dd3036b87f97239581a20f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 07:47:58 +00:00
Paul Hu
0b5d785096 Merge "Stop the created handler threads on the tests" into main 2023-10-12 07:13:30 +00:00
Paul Hu
ebbbf8f470 Stop the created handler threads on the tests
The created handler thread will stay there for a while until
all the tests are finished. This is considered as a leakage
which will take the resource from the devices. In low end
devices, this may possibly impact the performance. The created
threads should be closed explicitly.

Test: atest ConnectivityCoverageTests ConntrackSocketTest
Change-Id: Ic1beb2a210e7c8c80c66fc9e0727c47599150672
2023-10-12 10:25:03 +08:00
Jihoon Kang
cfef2cfc36 Merge "Prepare for keeping concrete overrides of abstract methods" into main am: 415773ed06 am: 31e55bbe5a am: 5badc74a7f am: 657ed5ac9b am: 8f7ffa4f58
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2781647

Change-Id: I61423b7937c2453847594d0766da3795a1ad8f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 00:07:48 +00:00
Jihoon Kang
9df878785f Merge "Prepare for keeping concrete overrides of abstract methods" into main am: 415773ed06
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2781647

Change-Id: I33c7e6c3198e863941ee3a03175dc73cc76a6ea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 21:39:39 +00:00
Jihoon Kang
5badc74a7f Merge "Prepare for keeping concrete overrides of abstract methods" into main am: 415773ed06 am: 31e55bbe5a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2781647

Change-Id: I69fae75745180a4354526f295dd9ff8b50ac1063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 21:26:07 +00:00
Jihoon Kang
415773ed06 Merge "Prepare for keeping concrete overrides of abstract methods" into main 2023-10-11 21:02:18 +00:00
Maciej Żenczykowski
6a8bcc8e3e build netbpfload into the tethering apex am: a2a3d754a6 am: 7dd74423c4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2781564

Change-Id: I411df7ebaa8bffd3232d720965cd9259c3abd292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 05:14:13 +00:00
Maciej Żenczykowski
6cedbfcf65 build netbpfload into the tethering apex am: a2a3d754a6 am: b8f98c3155
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2781564

Change-Id: I802b5896f7a2970a2857da2e0537ad2536df3a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 05:13:56 +00:00
Maciej Żenczykowski
7dd74423c4 build netbpfload into the tethering apex am: a2a3d754a6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2781564

Change-Id: I2551e588e692428c67dc6a48a563e92e693a2d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 04:07:43 +00:00
Maciej Żenczykowski
a2a3d754a6 build netbpfload into the tethering apex
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Id68aece26115808c2b1b795b9395208f5066f87c
2023-10-10 16:51:01 -07:00
Paul Duffin
7bd2d108ea Prepare for keeping concrete overrides of abstract methods
Currently, metalava will discard concrete overrides of abstract methods
from the API signature files which causes problems when attempting to
generate stubs from those files and also discards information that may
be important in API reviews. This change is the first step in the
process of changing that behavior.

This change hard codes the current behavior for discarding the concrete
overrides (`add-additional-overrides=no`) into those signature files
that will (or are likely) to be affected by the change in behavior.
That allows the default behavior to be changed for all the other files
without affecting these.

Follow up changes will remove the hard coding from the signature files
and will update the contents which will include the concrete overrides
of the abstract methods.

More information and the background for this change is available at
go/add-overriding-one-pager.

Test: m checkapi
Bug: 299366704
Change-Id: I52c5bbe2e3bbd36019fe44fcb0b2d19876a5a869
2023-10-10 17:11:25 +01:00
KH Shi
8a802cf47e Merge "Decouple Ipv6UpstreamRule with Ipv6DownstreamRule" into main am: 2a6a7359b7 am: ef7cb5e58a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2711576

Change-Id: Id94d86e40162c201a124c94e5261c7eafbbbadaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 08:07:05 +00:00
KH Shi
c0262413a8 Merge "Decouple Ipv6UpstreamRule with Ipv6DownstreamRule" into main am: 2a6a7359b7 am: 9f7f268e5d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2711576

Change-Id: I3bd0ccd789e587d46118da046673af7b808334b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 08:06:59 +00:00
KH Shi
ef7cb5e58a Merge "Decouple Ipv6UpstreamRule with Ipv6DownstreamRule" into main am: 2a6a7359b7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2711576

Change-Id: I662a8954de06f524d184eee4a472fe4f2088bdbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 06:58:56 +00:00