Commit Graph

3174 Commits

Author SHA1 Message Date
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
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
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
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
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
415773ed06 Merge "Prepare for keeping concrete overrides of abstract methods" into main 2023-10-11 21:02:18 +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
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
KH Shi
9f7f268e5d Merge "Decouple Ipv6UpstreamRule with Ipv6DownstreamRule" into main am: 2a6a7359b7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2711576

Change-Id: I46b48a93f9920b860a036a92152d2eee1c013df0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 06:58:36 +00:00
KH Shi
2a6a7359b7 Merge "Decouple Ipv6UpstreamRule with Ipv6DownstreamRule" into main 2023-10-02 05:33:48 +00:00
Bill Yi
9b9d0382e2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idfc3cbd85f9254916959275e2acaf8390321fae1
2023-09-21 21:05:19 -07:00
Mark Chien
6ab29917b4 Merge "SyncSM04: implement processMessage function" into main am: 35f19e74a9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2301482

Change-Id: Ib8468e83da956ee4a6c191baad8be13db51813b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 03:23:52 +00:00
Mark Chien
b23b655bff Merge "SyncSM04: implement processMessage function" into main am: 35f19e74a9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2301482

Change-Id: I2dfff2c5a390a603c2f91637c404b7248c664ad1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 03:23:45 +00:00
Mark Chien
35f19e74a9 Merge "SyncSM04: implement processMessage function" into main 2023-09-20 02:36:05 +00:00
Kangping Dong
f8d0c8e128 Merge "[Thread] initial Thread network service" into main am: 01e6dadd1f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2721333

Change-Id: I23a484fb28aa9d2e8a006794fbc3bc98e8c0b64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 11:29:33 +00:00
Kangping Dong
e5f1122ec9 Merge "[Thread] initial Thread network service" into main am: 01e6dadd1f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2721333

Change-Id: I5b1dad9c40dcade78c352265164da0992a3fcb0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 11:29:17 +00:00
Treehugger Robot
e18cb6a5ce Merge "SyncSM03: implement state transition logic" into main am: 6551cc5620
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2325064

Change-Id: I44b242d09455f8037e8327c2262d54c23a677d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 11:29:11 +00:00
Treehugger Robot
65b43d4e34 Merge "SyncSM03: implement state transition logic" into main am: 6551cc5620
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2325064

Change-Id: I7b39cdf76b3faafa8001562122d90fa2ab5f2714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 11:29:01 +00:00
Kangping Dong
01e6dadd1f Merge "[Thread] initial Thread network service" into main 2023-09-19 11:25:37 +00:00
Treehugger Robot
6551cc5620 Merge "SyncSM03: implement state transition logic" into main 2023-09-19 10:54:24 +00:00
Mark
21cdb40e59 SyncSM04: implement processMessage function
After this change, all synchronous state machine functions are
implemented.
There are some intentional limiations:
1. Allow setup states before machine thread started or inside machine
   thread but states can only be setup once before calling #start.
2. The behavior of transitionTo is defined so that the destination
   state can never change during state transitions. Once a destination
   has been specified, it cannot be changed until the previous state
   transition is complete. In other words, SyncStateMachine does not
   support calling transitionTo in State enter or exit.
3. Support sendSelfMessage in State#processMessage(), #enter() and
   #exit(). This allow automaton to decide the follow up action by
   itself. For example: if something wrong happens during state
   transition, the implementation can enqueue an error message then
   process the error message after finishing the current state
   transition.

Test: atest SynStateMachineTest
Change-Id: I0790df4eeab2dccdb9f407d9131a62c3c12d123b
2023-09-19 08:20:56 +00:00
KH Shi
701c3ca2f5 Decouple Ipv6UpstreamRule with Ipv6DownstreamRule
Currently, Ipv6UpstreamRule is added follows the adding of
Ipv6DownstreamRule when it is the first rule from a downstream
interface to the upstream interface.

This CL changed it to:
1. Upstream interface change updates both IPv6 upstream and downstream
   forwarding rules.
2. Neighbor events updates only IPv6 downstream forwarding rules.

Data limit setting on the upstream interface is now depend on the
upstream rules instead of the downstream rules. This CL also updates
corresponding test cases in IpServerTest and BpfCoordinatorTest.

Test: atest TetheringTests
Bug: 261923493
Change-Id: I5b4df64a3d276afb7a24bbef3a0432f53377e8b2
2023-09-19 08:02:24 +00:00
Treehugger Robot
1fe85f9965 Merge "SyncSM02: implement addState function" into main am: c5ebf2a7e6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2325063

Change-Id: Iec89de5065c6aca1520965b2f1ca179ff9fa3b81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 05:20:51 +00:00
Treehugger Robot
bf562951db Merge "SyncSM02: implement addState function" into main am: c5ebf2a7e6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2325063

Change-Id: I8e0920f123afe43b2a0e8174afa654ef9afb76e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 05:20:33 +00:00
Treehugger Robot
c5ebf2a7e6 Merge "SyncSM02: implement addState function" into main 2023-09-19 04:46:22 +00:00
Treehugger Robot
1ba0fe16a1 Merge "SyncSM01: define SyncStateMachine user interface" into main am: 85c1247b3c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2325062

Change-Id: I34f49819d5679d43ccec7dfa3f18dfc9190a1c7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 04:28:34 +00:00
Treehugger Robot
60b5e666a8 Merge "SyncSM01: define SyncStateMachine user interface" into main am: 85c1247b3c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2325062

Change-Id: Ia7202e652e36829882b58e1f6fc4a6f65c53c1c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 04:28:20 +00:00
Treehugger Robot
85c1247b3c Merge "SyncSM01: define SyncStateMachine user interface" into main 2023-09-19 03:44:58 +00:00
Mark
9e572d10f3 SyncSM03: implement state transition logic
Implement performTransitions which does state transitions.
1. Determine the common ancestor state of current/destination states
2. Invoke state exit list from current state to common ancestor state.
3. Invoke state enter list from common ancestor state to destState by
going through mEnterStateStack.

The state transition is always defined so that the target can never be
changed mid-way of a state transition. In other words, calling
transitionTo in State enter and exit is not allowed.

Test: atest SyncStateMachineTest
Change-Id: I51e8c5440a8b9ac25715c3d030717421f68c15b3
2023-09-15 14:38:12 +00:00
Mark
1d460b568e SyncSM02: implement addState function
Duplicated state is not allowed.

Test: atest SynStateMachineTest
Change-Id: I0d5c73f666f90aebcfbf535cf0f824c5050941a2
2023-09-15 14:23:52 +00:00
Treehugger Robot
ec506c95af Merge "SyncSM10: explicitly keep TetheringUtils jni methods" into main am: 19b785954a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2353243

Change-Id: Ibff41fa7aabbfc6c586b63bf18250519bdeb9491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 09:16:08 +00:00
Treehugger Robot
59b4a7ebcc Merge "SyncSM10: explicitly keep TetheringUtils jni methods" into main am: 19b785954a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2353243

Change-Id: Iab609a6277b41f376e8335518b24a0163fd1e0bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 09:16:00 +00:00
Treehugger Robot
19b785954a Merge "SyncSM10: explicitly keep TetheringUtils jni methods" into main 2023-09-15 08:32:37 +00:00
Mark
b48caa22f3 SyncSM01: define SyncStateMachine user interface
This change adds SyncStateMachine class and provides the user
interface but doesn't have the details implementation.

Test: m
Change-Id: Ic2fa69b9e6424601fc2df2d07a052f48a6a46370
2023-09-15 08:07:22 +00:00
Treehugger Robot
b41a17a4f4 Merge "Fix EthernetTetheringTest#testLocalOnlyTethering flaky" into main am: 47158c98b5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2676841

Change-Id: Iffe892336e49b68f69b14aca140345983abeb3bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 18:07:58 +00:00
Treehugger Robot
ec52b7baaa Merge "Fix EthernetTetheringTest#testLocalOnlyTethering flaky" into main am: 47158c98b5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2676841

Change-Id: Ic120c1cf394a040ebde923cd419ecd03e57b18a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 18:05:00 +00:00
Treehugger Robot
47158c98b5 Merge "Fix EthernetTetheringTest#testLocalOnlyTethering flaky" into main 2023-09-14 17:40:06 +00:00
Mark
87800837dd SyncSM10: explicitly keep TetheringUtils jni methods
Found R8 accidentally remove TetheringUtils jni methods while doing
some refactor. If any of jni java methods is removed by R8, devices
would fail to boot because of jni registering failure. Explicitly
adding progurad rule to make sure R8 never remove it.

Test: boot, atest CtsTetheringTest

Change-Id: I091a2f094d01f683fb454ed4624be35555940393
2023-09-14 14:39:25 +00:00
Treehugger Robot
ac88cd6df9 Merge "Add test for downstream tethering" into main am: dba0dbc7ec
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606668

Change-Id: I251696b855e7f971ac740eb70fa86a4158f15c58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 02:09:58 +00:00
Treehugger Robot
3a3392147d Merge "Add test for downstream tethering" into main am: dba0dbc7ec
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606668

Change-Id: I493b7179d0101682eb739ec451ebbb4da932c40a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 02:09:54 +00:00
Treehugger Robot
dba0dbc7ec Merge "Add test for downstream tethering" into main 2023-09-13 01:01:32 +00:00
Kangping Dong
1cec48f3c0 [Thread] initial Thread network service
This commit sets up the initial Thread network service for the
Android Thread feature which allows an Android device to create
a Thread network and being a Border Router.

See https://www.threadgroup.org/What-is-Thread for background of
Thread.

See b/235016403 for the Android Thread feature request.

Test: lunch aosp_cf_x86_64_tv-userdebug
      m && launch_cvd
      atest CtsThreadNetworkTestCases
Bug: 262683651
Change-Id: Ie1bb23084531f67165ec068ea3ca39592dbc01d1
2023-09-12 21:48:57 +08:00