Merge "Adding additional transport satellite support at getSubIdForMobile()" into main am: 745dc316

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2977371



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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2981694



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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2983551



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

This reverts commit 55648268.

Reason for revert: DroidMonitor revert

Change-Id: Idd86b0ceb18fc425c39fe3c75603a472568eabe1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2981594



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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2916726



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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2632298



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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2920825



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

Previously we were using TUN test network which is not eligible for mDNS
operations. The tests are flaky because we need to depend on other test
cases to connect to WiFi, which is not guaranteed. We'll use the TAP
test network to fix it.

Bug: 327306555
Bug: 327306158
Bug: 327306608

Change-Id: Ia6de8a507578dbdeea4a7ceaf52f417acf35baa2

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2981354



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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2969479



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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2981692



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

- TRANSPORT_SATELLITE uses same network specifier as TRANSPORT_CELLULAR

Bug: 326967680
Test: m and atest FrameworksNetTests
Change-Id: I2943db0304f207982d524771a0525861dcab294a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2979032



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

should never fail, since we now have M-2024-1 module prebuilts:
  $ adb shell ls -d /apex/com.android.tethering*
  /apex/com.android.tethering
  /apex/com.android.tethering@341310230

Test: TreeHugger, manually on a Pixel device
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib145fba8e3c47bc300f4589723d9c80749770a19

Make the default Thread and Border Router enabled state customizable for
vendor via resource overlay.

Bug: 322734489
Change-Id: I278d6afa82aac8d1bb06ee79f22bae6fb0199386

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2967005



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

The classes in the vpn-jarjar-rules are used for
ConnectivityServiceTest. As the dependency are removed from the
ConnectivityServiceTest, it's no longer needed. Remove these
two classes from the jarjar-rules.

Test: m ; atest FrameworksNetTests
Change-Id: I0e4b170ca3e570741842f2a243be44f4ce9fc373

The multicast listening address from ot-daemon is maintained separately
from the bbr state. When bbr changes from primary to secondary, there
can still be subscribed addresses and should not be missed when switching
back to primary mode. So instead of sending address add/remove events
from ot-daemon and maintain the list in system server, ot-daemon will
send full list of addresses together with the multicast routing
enablement state each time there is an update to the bbr state or
listening addresses.

Bug: 321624274

Test: atest ThreadNetworkIntegrationTests

Change-Id: Ic9ce77bb7fdeacf2def216cf9bcd44095083a992

[automerger skipped] Merge "[Thread] add Thread aconfig_declaration to java_sdk_library" into main am: 22074a3e -s ours

am skip reason: Merged-In I8a71f4ee49cc68a9512f432e454469200f2a5058 with SHA-1 7fd35e54 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2971692



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

[automerger skipped] [Thread] add Thread aconfig_declaration to java_sdk_library am: 8fb80dd0 -s ours

am skip reason: Merged-In I8a71f4ee49cc68a9512f432e454469200f2a5058 with SHA-1 7fd35e54 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2971692



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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2976852



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

testSampleConnectivityState was flaky since sometimes networks were
disconnected before ConnectivityService#sampleConnectivityState
generates metrics
This CL fixes this issue by adding setKeepConnectedReason to prevent
networks are disconnected

Bug: 318546530
Test: TH
Change-Id: I824f5cd379c8144b48341cc0fd18eb976a4b1cde

36a8ecbb

Bug: 304347838
Change-Id: I6f8b20e65539a7523db6a7a9d92444dec0523d10

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2966585



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