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
102,618 commits 1 branch 0 tags 204 MiB
Commit graph

102,618 commits

This branch
This branch
All branches
Message SHA1
Baseline NewApi issues 
NewApi is a lint check that you don't call framework methods that were
introduced in versions later than your min_sdk_version. We want to
make this an error, so we're baselineing all existing issues.

This cl was generated automatically, by taking all the NewApi issues
from the reference baselines, and all the non-NewApi issues from the
existing checked in baselines.

Bug: 268261262
Test: Presubmits
Change-Id: I0393f24f101876abc458ca139eefdb279dcb2b03

Cole Faust   commited 2024-01-10 12:30:41 -08:00
4ecdedda37
Merge "[Thread] define flag thread_user_restriction_enabled" into main am: e32111c8fc am: aba9b7ceb0 am: f698c9706e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2897512

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2024-01-09 11:55:42 +00:00
f6d5535b30
Merge "[Thread] define flag thread_user_restriction_enabled" into main am: e32111c8fc am: 3c97dd5e18 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2897512

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2024-01-09 11:22:31 +00:00
6c0dca4459
Merge "[Thread] define flag thread_user_restriction_enabled" into main am: e32111c8fc am: aba9b7ceb0 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2897512

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2024-01-09 11:21:32 +00:00
f698c9706e
Merge "[Thread] define flag thread_user_restriction_enabled" into main am: e32111c8fc 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2897512

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2024-01-09 10:53:08 +00:00
aba9b7ceb0
Merge "[Thread] define flag thread_user_restriction_enabled" into main am: e32111c8fc 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2897512

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2024-01-09 10:51:11 +00:00
3c97dd5e18
Merge "[Thread] define flag thread_user_restriction_enabled" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2024-01-09 10:15:51 +00:00
e32111c8fc
[automerger skipped] Merge "[Thread] add Android.bp for Thread flags" into main am: e19a753182 am: e5547186f5 am: 65f3a474f8 -s ours 
am skip reason: Merged-In I88c993680976d2e10d672bfdbf45119f2db13868 with SHA-1 da8fac1edb is already in history

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

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-09 07:33:33 +00:00
04e1d016af
Request Thread network at the initialize() am: 90d2d0d0d9 am: 1cff253a31 am: 80c2aade6c 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2900968

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

Handa Wang   authored and   Automerger Merge Worker   commited 2024-01-09 07:33:13 +00:00
b06ff546af
[automerger skipped] Merge "[Thread] add Android.bp for Thread flags" into main am: e19a753182 -s ours am: 6f739fa8b7 -s ours 
am skip reason: Merged-In I88c993680976d2e10d672bfdbf45119f2db13868 with SHA-1 da8fac1edb is already in history

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

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-09 07:02:06 +00:00
9ab4f12b3f
[automerger skipped] [Thread] add Android.bp for Thread flags am: a59a6e304b -s ours am: 4135786d7a -s ours 
am skip reason: Merged-In I88c993680976d2e10d672bfdbf45119f2db13868 with SHA-1 da8fac1edb is already in history

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

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-09 07:02:03 +00:00
8046a0ab42
Request Thread network at the initialize() am: 90d2d0d0d9 am: 79aca8554d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2900968

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

Handa Wang   authored and   Automerger Merge Worker   commited 2024-01-09 07:01:49 +00:00
3ffdd0dc86
Merge "[Thread] add Android.bp for Thread flags" into main am: e19a753182 am: e5547186f5 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2900567

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-09 07:01:11 +00:00
65f3a474f8
Request Thread network at the initialize() am: 90d2d0d0d9 am: 1cff253a31 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2900968

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

Handa Wang   authored and   Automerger Merge Worker   commited 2024-01-09 07:00:50 +00:00
80c2aade6c
Merge "[Thread] add Android.bp for Thread flags" into main am: e19a753182 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2900567

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-09 06:28:48 +00:00
e5547186f5
Request Thread network at the initialize() am: 90d2d0d0d9 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2900968

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

Handa Wang   authored and   Automerger Merge Worker   commited 2024-01-09 06:28:16 +00:00
1cff253a31
[automerger skipped] Merge "[Thread] add Android.bp for Thread flags" into main am: e19a753182 -s ours 
am skip reason: Merged-In I88c993680976d2e10d672bfdbf45119f2db13868 with SHA-1 da8fac1edb is already in history

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

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-09 06:27:06 +00:00
6f739fa8b7
[automerger skipped] [Thread] add Android.bp for Thread flags am: a59a6e304b -s ours 
am skip reason: Merged-In I88c993680976d2e10d672bfdbf45119f2db13868 with SHA-1 da8fac1edb is already in history

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

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-09 06:27:03 +00:00
4135786d7a
Request Thread network at the initialize() am: 90d2d0d0d9 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2900968

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

Handa Wang   authored and   Automerger Merge Worker   commited 2024-01-09 06:26:18 +00:00
79aca8554d
Merge "[Thread] add Android.bp for Thread flags" into main
Kangping Dong   authored and   Gerrit Code Review   commited 2024-01-09 06:10:23 +00:00
e19a753182
[Thread] define flag thread_user_restriction_enabled 
Define this flag for guarding UserManager#DISALLOW_THREAD_NETWORK

Bug: 307679182
Change-Id: I69c578d76f3aac250bb733aac74754c127ae453b

Kangping Dong   commited 2024-01-09 13:58:58 +08:00
856b7156d7
[Thread] add Android.bp for Thread flags 
This is not required for code in the mainline module since the flag
infra is not supported for mainline. But we will need to write code
in UserManager and it needs to be guarded by new Thread flags.

Note that Merged-In is added to skip merging this CL into the
udc-mainline-prod branch because trunk stable flagging is not supported
there

Bug: 307679182
Test: m
Merged-In: I88c993680976d2e10d672bfdbf45119f2db13868
Change-Id: Id53fa3e7c9592b04f37f4cbd7dcd0499859e59ed

Kangping Dong   commited 2024-01-09 13:58:41 +08:00
a59a6e304b
Request Thread network at the initialize() 
Currently requestThreadNetwork is called in registerThreadNetwork. This creates a new NetworkCallback for Thread every time when Thread is turned on. We'd better just use one callback to avoid potential issues.

Bug: 319179354

Change-Id: I96bad351f089b32a9acd919dea2e2b6b2aea68d2

Handa Wang   commited 2024-01-09 05:35:01 +00:00
90d2d0d0d9
Merge "[Thread] start / initialize Thread service early" into main am: 79e3b59358 am: c4a455ce0a am: 29fe59b3f3 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899288

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-08 14:59:07 +00:00
78057a36cb
Merge "[Thread] start / initialize Thread service early" into main am: 79e3b59358 am: 88710362f1 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899288

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-08 14:13:11 +00:00
30956dc04e
Merge "[Thread] start / initialize Thread service early" into main am: 79e3b59358 am: c4a455ce0a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899288

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-08 14:12:29 +00:00
29fe59b3f3
Merge "[Thread] start / initialize Thread service early" into main am: 79e3b59358 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899288

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-08 13:41:18 +00:00
c4a455ce0a
Merge "[Thread] start / initialize Thread service early" into main am: 79e3b59358 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899288

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-08 13:39:22 +00:00
88710362f1
Merge "[Thread] start / initialize Thread service early" into main
Kangping Dong   authored and   Gerrit Code Review   commited 2024-01-08 12:55:02 +00:00
79e3b59358
[Thread] start / initialize Thread service early 
We need to do initialization work and start OT daemon when
system_server boots. But the initialize() is called at the phase
PHASE_BOOT_COMPLETED which is too late as Apps (e.g. Google Play
Services) can be started before this phase.

This commit changes to start the Thread service earlier at the phase
PHASE_SYSTEM_SERVICES_READY. Other services such as Wi-Fi, Bluetooth,
Ethernet and Nearby all starts / initializes at this phase.

This commit resolves comment aosp/2737373/comment/d65b9446_8a08117c

Bug: 318787467
Test: atest CtsThreadNetworkTestCases
Change-Id: I7b7b8551b9114cbf07f995b64316c7b420d868b6

Kangping Dong   commited 2024-01-08 13:48:18 +08:00
56354a961e
Document more errno(s) on ADnsHelper_ API am: 96aa4824b9 am: 6d3d0879a3 am: 7caab3eb0c 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899547

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

Ken Chen   authored and   Automerger Merge Worker   commited 2024-01-06 15:26:30 +00:00
eddd7bc1fa
Document more errno(s) on ADnsHelper_ API am: 96aa4824b9 am: bdef2b7a5c 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899547

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

Ken Chen   authored and   Automerger Merge Worker   commited 2024-01-06 14:56:34 +00:00
371dcfdf13
Document more errno(s) on ADnsHelper_ API am: 96aa4824b9 am: 6d3d0879a3 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899547

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

Ken Chen   authored and   Automerger Merge Worker   commited 2024-01-06 14:55:33 +00:00
7caab3eb0c
Document more errno(s) on ADnsHelper_ API am: 96aa4824b9 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899547

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

Ken Chen   authored and   Automerger Merge Worker   commited 2024-01-06 14:24:41 +00:00
6d3d0879a3
Document more errno(s) on ADnsHelper_ API am: 96aa4824b9 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899547

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

Ken Chen   authored and   Automerger Merge Worker   commited 2024-01-06 14:22:42 +00:00
bdef2b7a5c
Document more errno(s) on ADnsHelper_ API 
Address comments from android-api-council review.

Bug: 310992535
Change-Id: I722725bd3d3a3df1687721175e9434efae9da37a
Test: presubmit

Ken Chen   commited 2024-01-05 11:58:47 +00:00
96aa4824b9
Merge "Request cell network after carrier config change" into main am: 6dc199b54f am: 275a43c093 am: 595b8b2652 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899287

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

Natasha Lee   authored and   Automerger Merge Worker   commited 2024-01-05 07:53:19 +00:00
bb63966cd5
Merge "Request cell network after carrier config change" into main am: 6dc199b54f am: a89dd84859 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899287

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

Natasha Lee   authored and   Automerger Merge Worker   commited 2024-01-05 07:23:03 +00:00
0b7c184a83
Merge "Request cell network after carrier config change" into main am: 6dc199b54f am: 275a43c093 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899287

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

Natasha Lee   authored and   Automerger Merge Worker   commited 2024-01-05 07:22:10 +00:00
595b8b2652
Merge "Request cell network after carrier config change" into main am: 6dc199b54f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899287

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

Natasha Lee   authored and   Automerger Merge Worker   commited 2024-01-05 06:50:46 +00:00
275a43c093
Merge "Request cell network after carrier config change" into main am: 6dc199b54f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2899287

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

Natasha Lee   authored and   Automerger Merge Worker   commited 2024-01-05 06:48:45 +00:00
a89dd84859
Merge "Request cell network after carrier config change" into main
Natasha Lee   authored and   Gerrit Code Review   commited 2024-01-05 06:07:20 +00:00
6dc199b54f
Request cell network after carrier config change 
The cell network may reconnect on carrier config change, so a cell
network requested before that may be disconnected after the change.

Only request the cell network after the carrier config change, so the
network connected after the change is used for the test.

Bug: 316154796
Test: atest
Change-Id: Id8cd49ae352fd7899cb45efecd5ccfd760a7b1eb

Remi NGUYEN VAN   commited 2024-01-05 12:55:42 +09:00
91600692a0
Merge "[Thread] remove Thread.sleep from CTS tests" into main am: 60a36b3163 am: ac855cf67a am: 009c8a74c9 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2895263

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-04 13:07:47 +00:00
eff8fdac38
Merge "[Thread] remove Thread.sleep from CTS tests" into main am: 60a36b3163 am: e880d35485 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2895263

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-04 12:37:49 +00:00
925b8a114f
Merge "[Thread] remove Thread.sleep from CTS tests" into main am: 60a36b3163 am: ac855cf67a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2895263

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-04 12:36:51 +00:00
009c8a74c9
Merge "[Thread] remove Thread.sleep from CTS tests" into main am: 60a36b3163 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2895263

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-04 12:05:47 +00:00
ac855cf67a
Merge changes Id26a24c8,I3b6ac97e into main am: e8184501b8 am: c442143936 am: e1119f924e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2894583

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2024-01-04 12:04:08 +00:00
f3fd166d5f
Merge "[Thread] remove Thread.sleep from CTS tests" into main am: 60a36b3163 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2895263

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2024-01-04 12:03:50 +00:00
e880d35485
Merge changes Id26a24c8,I3b6ac97e into main am: e8184501b8 am: c442143936 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2894583

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2024-01-04 11:33:56 +00:00
e1119f924e