tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
53254 commits 1 branch 0 tags 121 MiB
Commit graph

53254 commits

This branch
This branch
All branches
Author SHA1 Message Date
Treehugger Robot
922176fd31 [automerger skipped] Merge "Bluetooth AIDL: SetTerminalRaw on fd" into udc-dev am: 261efeee0c -s ours 
am skip reason: Merged-In I97c92c407b7c80442a0ba0812a630525219670a0 with SHA-1 eb744bc14c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22935417

Change-Id: Ia356e4e928e614bdf7cf2ef35b657f1cc8afc688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:27:52 +00:00
yanggang.yang
832c90d0dc [automerger skipped] Bluetooth AIDL: SetTerminalRaw on fd am: d1abb34b44 -s ours 
am skip reason: Merged-In I97c92c407b7c80442a0ba0812a630525219670a0 with SHA-1 eb744bc14c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22935417

Change-Id: I3e8319399059269ba1a8ff65ee1ededfbe587587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:27:49 +00:00
Treehugger Robot
261efeee0c Merge "Bluetooth AIDL: SetTerminalRaw on fd" into udc-dev 2023-04-29 01:03:11 +00:00
Treehugger Robot
8848828aa4 Merge "Backport VTS fixes to previous test versions" into udc-dev am: 3d35c2e75c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22912666

Change-Id: I217b4e3a7504c3b52d25f37d83a99abceb3cf4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 23:42:38 +00:00
Subrahmanyaman
ce2bebdd79 Strongbox may not support 1024 bit key size for RSA. 
Strongbox may not support 1024 bit key size for RSA.
So in NoUserConfirmation test updated the key size to
2048 so that the test works for both TEE and Strongbox.

Bug: 280117495
Test: run VtsAidlKeyMintTarget
Change-Id: I32bb28001aca9b69eedb1bd3d0bcff43052d06e4
 2023-04-28 23:37:02 +00:00
Sarah Chin
8ab8f0d1d8 Backport VTS fixes to previous test versions 
Network scan check periodicity only if scan type is PERIODIC.
Fix MCC/MNC checks to handle null strings.

Test: atest VTS
Bug: 259674407
Change-Id: I77e0706f413ce9defb174f00ee145dcc01f5d780
Merged-In: I77e0706f413ce9defb174f00ee145dcc01f5d780
 2023-04-28 16:28:09 -07:00
Treehugger Robot
3d35c2e75c Merge "Backport VTS fixes to previous test versions" into udc-dev 2023-04-28 23:12:07 +00:00
Jayachandran C
376130a152 Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: caf536d72a am: 265db399d4 am: 883c7dca39 am: 106fe4139b 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: I076d1285b4b5088eeef4d89d63f8c7bb06d31ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 22:55:37 +00:00
Jayachandran C
6392012bfe Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: f9ce76989c am: ee6d6adf2f am: 8f05ae7c19 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: I859a9a2f3e2b79707d68d1912345654f330f2ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 22:47:43 +00:00
Jayachandran C
13d984ac6d Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: caf536d72a am: 265db399d4 am: 883c7dca39 am: 7e27acce70 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: I71a3a1e72423058a563a658b0cbc4df13fc7e19e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 22:45:51 +00:00
Jayachandran C
106fe4139b Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: caf536d72a am: 265db399d4 am: 883c7dca39 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: I3464dac6933cb102480c0d9a83ab3b9e485851ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 22:42:21 +00:00
Jayachandran C
5bea6b89c8 Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: caf536d72a am: eaeb13c583 am: 98b15ce956 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: I0999cbb9091af416fe0ecb552a10ffb2f98a1026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 22:42:03 +00:00
Jayachandran C
7e27acce70 Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: caf536d72a am: 265db399d4 am: 883c7dca39 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: I4939c31e300a76810374cfbb481618e327bf1f36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 22:41:19 +00:00
Jayachandran C
883c7dca39 Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: caf536d72a am: 265db399d4 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: Iaa0770ff968c7fd0b2bb35d87985f7c797965233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 22:01:37 +00:00
Jayachandran C
98b15ce956 Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: caf536d72a am: eaeb13c583 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: I70a3f5264884508d3ae4da6f27a539d388bb1495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 21:58:59 +00:00
Jayachandran C
8f05ae7c19 Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: f9ce76989c am: ee6d6adf2f 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: I71b908cb1cb62cccdbe91cfd52806e033107df4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 21:57:24 +00:00
Jayachandran C
265db399d4 Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: caf536d72a 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: Ibf85aa7369926cc2addcefacb4a84ddd8b11dc13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 21:18:40 +00:00
Treehugger Robot
f3dcc82a6b Merge "Bluetooth AIDL: SetTerminalRaw on fd" am: 4de72a2297 am: bb8c28de90 am: 8b2a877457 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2556557

Change-Id: I31c22dd5c92a8fef9769280885fce4f1f4f49b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 21:18:19 +00:00
Jayachandran C
eaeb13c583 Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: caf536d72a 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: I8736816fcbf822e614879d092c578e86e1b5b2eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 21:17:36 +00:00
Jayachandran C
ee6d6adf2f Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: f9ce76989c 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: I5a87eeebcfbad1b965ac0181fa133be562ef2f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 21:17:07 +00:00
Treehugger Robot
8b2a877457 Merge "Bluetooth AIDL: SetTerminalRaw on fd" am: 4de72a2297 am: bb8c28de90 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2556557

Change-Id: I1b56c525f280d174567dc0ff82f2a7c5dbcda8bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 20:52:20 +00:00
Jayachandran C
f9ce76989c Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: Ie637c517fef3d38ee80c69e8eab031ad33a5c4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 20:37:07 +00:00
Sarah Kim
7a72a0393b [automerger skipped] Merge "Fix broken and flaky VTS tests" am: 2facc26b0c am: ac790352d8 am: 68479d1266 -s ours 
am skip reason: Merged-In Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6 with SHA-1 757a75879f is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2569373

Change-Id: I80ebbadac365628900150a3201225a5753c7e6aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 20:34:48 +00:00
Jayachandran C
caf536d72a Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: I0c77e5981d6360599f088a24ec8a50f2afd82a9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 20:32:01 +00:00
Treehugger Robot
bb8c28de90 Merge "Bluetooth AIDL: SetTerminalRaw on fd" am: 4de72a2297 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2556557

Change-Id: I2d27dc654bc8e0eef8b47485b9e3ea455cb449a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 20:13:40 +00:00
Jayachandran C
2b072c63c9 Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev 2023-04-28 20:08:53 +00:00
Wyatt Riley
96d835a892 Adding bug component per http://go/xts-owners-policy 
Bug: 278494314
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:890bdd52fd3b406e750fffe40e9c5f3b331c0358)

Change-Id: I36a1781f1cf47d2b8177762b28a3d717484f0089
 2023-04-28 20:08:30 +00:00
Sarah Kim
68479d1266 Merge "Fix broken and flaky VTS tests" am: 2facc26b0c am: ac790352d8 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2569373

Change-Id: If58187b4e01eff9c5b7d285c0add05319e31d63f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:52:52 +00:00
yanggang.yang
d1abb34b44 Bluetooth AIDL: SetTerminalRaw on fd 
Call SetTerminalRaw on the fd that was opened, since mFD has not been set. If SetTerminalRaw fails, log it but continue, since some platforms do not need this call.

Bug: 279870989
Test: start Bluetooth on a device that doesn't need SetTerminalRaw
(cherry picked from https://android-review.googlesource.com/q/commit:eb744bc14c0d1e64c4291b3f869d6055db36b0f3)
Merged-In: I97c92c407b7c80442a0ba0812a630525219670a0
Change-Id: I97c92c407b7c80442a0ba0812a630525219670a0
 2023-04-28 19:36:38 +00:00
Treehugger Robot
4de72a2297 Merge "Bluetooth AIDL: SetTerminalRaw on fd" 2023-04-28 19:29:33 +00:00
Sarah Kim
ac790352d8 Merge "Fix broken and flaky VTS tests" am: 2facc26b0c 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2569373

Change-Id: I57fb58c18ced1f9b2fdd9ef2722cc2d5779619a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:10:38 +00:00
Henri Chataing
a4b4be6c2b Merge "Bluetooth: Enable test Cdd_C_12_1_Bluetooth5Requirements" am: f41cdd3d0d am: 2c2472ee9e am: 30bc77e297 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2551038

Change-Id: Ia47d1611ce185c4ed0faf4a3e85aca404f0c9800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:09:56 +00:00
Sarah Chin
7f3bd1792f Fix broken and flaky VTS tests 
nvResetConfig takes some time to reset the modem, causing subsequent
tests to fail with a timeout since the modem is unavailabe.
Add a timeout after nvResetConfig to allow the modem to be up again
before running the next test.

Bug: 259674407
Test: atest VtsHalRadioTargetTest
Change-Id: Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6
Merged-In: Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6
(cherry picked from commit ddaea2e5a4)
 2023-04-28 18:33:08 +00:00
Henri Chataing
30bc77e297 Merge "Bluetooth: Enable test Cdd_C_12_1_Bluetooth5Requirements" am: f41cdd3d0d am: 2c2472ee9e 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2551038

Change-Id: I8d744c922e97a4bfc05ace6447e2385ce6646102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 18:29:26 +00:00
Sarah Kim
2facc26b0c Merge "Fix broken and flaky VTS tests" 2023-04-28 18:29:25 +00:00
Sarah Chin
fc35c0797e Backport VTS fixes to previous test versions 
Network scan check periodicity only if scan type is PERIODIC.
Fix MCC/MNC checks to handle null strings.

Test: atest VTS
Bug: 259674407
Change-Id: I77e0706f413ce9defb174f00ee145dcc01f5d780
 2023-04-28 11:12:01 -07:00
Henri Chataing
2c2472ee9e Merge "Bluetooth: Enable test Cdd_C_12_1_Bluetooth5Requirements" am: f41cdd3d0d 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2551038

Change-Id: I9f0e2c6aafd9251c9eec725e3b0ac02a789dc616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 17:37:14 +00:00
Henri Chataing
f41cdd3d0d Merge "Bluetooth: Enable test Cdd_C_12_1_Bluetooth5Requirements" 2023-04-28 17:35:03 +00:00
Jiabin Huang
b811015579 AHAL: add more comment for IModule.disconnectExternalDevice 
Bug: 277955540
Test: TH
(cherry picked from https://android-review.googlesource.com/q/commit:cf210c83b2d29882aa0144a8e52af0d460628b6e)
Merged-In: I0d6a73884ab4bcfec62da45124024e8680155144
Change-Id: I0d6a73884ab4bcfec62da45124024e8680155144
 2023-04-28 17:10:05 +00:00
yanggang.yang
eb744bc14c Bluetooth AIDL: SetTerminalRaw on fd 
Call SetTerminalRaw on the fd that was opened, since mFD has not been set. If SetTerminalRaw fails, log it but continue, since some platforms do not need this call.

Bug: 279870989
Test: start Bluetooth on a device that doesn't need SetTerminalRaw
Change-Id: I97c92c407b7c80442a0ba0812a630525219670a0
 2023-04-28 17:02:08 +00:00
Sarah Chin
9426eab44a Require SIM card for all VTS tests 
We check SIM card status is PRESENT before running any VTS tests, so
ensure that it's enforced in the configs as well.

Test: atest VtsHalRadioTargetTest
Bug: 249143796
Change-Id: I1b2c317e21db118e4b957804feb76f266d887b20
Merged-In: I1b2c317e21db118e4b957804feb76f266d887b20
(cherry picked from commit 658fdaaa2a)
 2023-04-28 07:05:09 +00:00
Sarah Chin
dd5a3f6ce9 [automerger skipped] Require SIM card for all VTS tests am: 658fdaaa2a am: bf7f97d41f am: a765bd4088 -s ours 
am skip reason: Merged-In I1b2c317e21db118e4b957804feb76f266d887b20 with SHA-1 899b03c945 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2568974

Change-Id: I40ede8357273fe7b2e893a50cb04a6b67afe7532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 06:09:00 +00:00
Sarah Chin
a765bd4088 Require SIM card for all VTS tests am: 658fdaaa2a am: bf7f97d41f 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2568974

Change-Id: I107c63e8ae9e2af8116fbd060021ca2419e7ada8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 05:17:26 +00:00
Sarah Chin
bf7f97d41f Require SIM card for all VTS tests am: 658fdaaa2a 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2568974

Change-Id: I4aae131e29adf28ec4d1e72d1e986b8f620f81b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 04:34:37 +00:00
Jiabin Huang
52b3a84ad9 AHAL: add more comment for IModule.disconnectExternalDevice am: cf210c83b2 am: 9d4c534842 am: 4dc9970230 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2569670

Change-Id: Ie305e2bb4ad01b935f2b051a37ea225afc94f19f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:46:34 +00:00
Jiabin Huang
4dc9970230 AHAL: add more comment for IModule.disconnectExternalDevice am: cf210c83b2 am: 9d4c534842 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2569670

Change-Id: I133f4f6fafbcc43d1fd1d0446016e472e2eae60b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 02:53:03 +00:00
Treehugger Robot
8dbef2e479 Merge "Mention that ErrorState and StatusCode must match" into udc-dev am: f8cdade2d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22819697

Change-Id: Ibd070e5c4169f3ff39a1c0b2b235520ea4c8331f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 02:32:34 +00:00
Jiabin Huang
9d4c534842 AHAL: add more comment for IModule.disconnectExternalDevice am: cf210c83b2 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2569670

Change-Id: I1b674adfdb5d66fc9829b361ca2035ce8b0629d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 02:09:11 +00:00
Sarah Chin
658fdaaa2a Require SIM card for all VTS tests 
We check SIM card status is PRESENT before running any VTS tests, so
ensure that it's enforced in the configs as well.

Test: atest VtsHalRadioTargetTest
Bug: 237504027
Change-Id: I1b2c317e21db118e4b957804feb76f266d887b20
Merged-In: I1b2c317e21db118e4b957804feb76f266d887b20
 2023-04-27 18:44:23 -07:00
Sarah Chin
ddaea2e5a4 Fix broken and flaky VTS tests 
1. nvResetConfig takes some time to reset the modem, causing subsequent
   tests to fail with a timeout since the modem is unavailabe.
   Add a timeout after nvResetConfig to allow the modem to be up again
   before running the next test.
2. Remove invalid errors for start/stopKeepalive. These tests should
   fail due to invalid arguments, so remove NONE as a possible error.
   RADIO_NOT_AVAILABLE should also be removed.
3. Fix incorrect startNetworkScan_InvalidInterval tests, since we only
   check the interval when the scan type is PERIODIC.
4. Save and reset the previous allowed network type bitmap after the
   test. Combine get/set into one test that tests both behaviors.
5. Fix checks for MCC/MNC in getDataRegistrationState

Bug: 277626718
Bug: 240953393
Bug: 264913330
Bug: 259674407
Bug: 242801688
Test: atest VtsHalRadioTargetTest
Change-Id: Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6
Merged-In: Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6
 2023-04-27 18:43:06 -07:00