Commit Graph

55723 Commits

Author SHA1 Message Date
Treehugger Robot
d0c6ea82e6 Merge "Fix a DimmingStage documentation typo by rewording the doc." into main am: 299db35551 am: 518f74b2f9 am: 7cafdb3073 am: f0c1565ef0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2669815

Change-Id: Icbfc9d80b57d84e998803715f3b79e1643fe941e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 06:44:13 +00:00
Treehugger Robot
f0c1565ef0 Merge "Fix a DimmingStage documentation typo by rewording the doc." into main am: 299db35551 am: 518f74b2f9 am: 7cafdb3073
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2669815

Change-Id: Iaad9b14267c80e3baf1ff8f156b1e5bccc1ccc5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 05:57:22 +00:00
Treehugger Robot
7cafdb3073 Merge "Fix a DimmingStage documentation typo by rewording the doc." into main am: 299db35551 am: 518f74b2f9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2669815

Change-Id: Ibf33531aa91335f1a34d1d8db17dfa8ffbe84a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 05:13:07 +00:00
Treehugger Robot
518f74b2f9 Merge "Fix a DimmingStage documentation typo by rewording the doc." into main am: 299db35551
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2669815

Change-Id: I54c79cacff231c1b3528f487875687e1d4e58577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 04:30:25 +00:00
Treehugger Robot
299db35551 Merge "Fix a DimmingStage documentation typo by rewording the doc." into main 2023-07-21 03:44:41 +00:00
Treehugger Robot
fe235e6a6f Merge changes from topic "fix-b-264712385-primary-module" into main am: 12c4bf6ba1 am: cbd5c15f52 am: 69a3a68bac am: 592be4a29d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2666399

Change-Id: Ic8ab521207283ece25ab4dd0f4d4a2c4f1af3d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 01:52:53 +00:00
Treehugger Robot
592be4a29d Merge changes from topic "fix-b-264712385-primary-module" into main am: 12c4bf6ba1 am: cbd5c15f52 am: 69a3a68bac
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2666399

Change-Id: I39c80190e5e3ebd13b65a991086cf7e0f7ceb089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 01:08:59 +00:00
Treehugger Robot
69a3a68bac Merge changes from topic "fix-b-264712385-primary-module" into main am: 12c4bf6ba1 am: cbd5c15f52
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2666399

Change-Id: I1e79c1a41fe73e483b91fd32159bea8f904c4fb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 00:24:06 +00:00
Treehugger Robot
cbd5c15f52 Merge changes from topic "fix-b-264712385-primary-module" into main am: 12c4bf6ba1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2666399

Change-Id: If404a4284b437523f50e42e8574ecdd51f30dde4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 23:41:13 +00:00
Treehugger Robot
12c4bf6ba1 Merge changes from topic "fix-b-264712385-primary-module" into main
* changes:
  audio: Move StreamContext ownership out from StreamCommonImpl
  audio: Use ChildInterface in StreamCommonImpl
  audio: Update StreamAlsa and alsa utils for built-in devices
  audio: Simplify and extend alsa::Mixer
2023-07-20 23:09:50 +00:00
Alec Mouri
cdcfd05736 Fix a DimmingStage documentation typo by rewording the doc.
Change-Id: I5a1b3a99630cfded4b34c74b020bb4df2ce12084
2023-07-20 23:07:17 +00:00
Weilin Xu
5b4a465fc3 [automerger skipped] Fix null pointer crash in AIDL radio HAL VTS am: cf892db1ef am: e065f848d0 am: 050c07c475 am: bce78d1105 -s ours
am skip reason: Merged-In Icb67c27b9a747411a9bfbd48647e6e6046cf5e8d with SHA-1 cf892db1ef is already in history

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

Change-Id: I4d347d268258dd5aa81bc779fbed7866769e15ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 22:15:11 +00:00
Weilin Xu
1460fb8f6a [automerger skipped] Fix null pointer crash in AIDL radio HAL VTS am: cf892db1ef am: e065f848d0 am: 050c07c475 -s ours am: 0739bfc677 -s ours
am skip reason: Merged-In Icb67c27b9a747411a9bfbd48647e6e6046cf5e8d with SHA-1 cf892db1ef is already in history

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

Change-Id: I1afa4ea5bca636fd17f42a7cce761389c8618801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 21:50:57 +00:00
Weilin Xu
bce78d1105 Fix null pointer crash in AIDL radio HAL VTS am: cf892db1ef am: e065f848d0 am: 050c07c475
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24133137

Change-Id: I52e0a5a66e613108fc60371cb382f3713b34f1b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 21:32:03 +00:00
Weilin Xu
0739bfc677 [automerger skipped] Fix null pointer crash in AIDL radio HAL VTS am: cf892db1ef am: e065f848d0 am: 050c07c475 -s ours
am skip reason: Merged-In Icb67c27b9a747411a9bfbd48647e6e6046cf5e8d with SHA-1 cf892db1ef is already in history

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

Change-Id: Ie3e98c299301e86b229503616f447c3cd5a7acb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 21:31:00 +00:00
Weilin Xu
b974556e92 Fix null pointer crash in AIDL radio HAL VTS am: cf892db1ef am: e065f848d0 am: bf6bd2d8ef am: e1314d36bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24133137

Change-Id: I3cb361bf23056b559b5a2495c5198c42a7921cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 21:27:48 +00:00
Weilin Xu
e1314d36bb Fix null pointer crash in AIDL radio HAL VTS am: cf892db1ef am: e065f848d0 am: bf6bd2d8ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24133137

Change-Id: I05f734fe4ad48126ddb45a79c36c3e8c3e400ec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 21:07:26 +00:00
Weilin Xu
bf6bd2d8ef Fix null pointer crash in AIDL radio HAL VTS am: cf892db1ef am: e065f848d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24133137

Change-Id: Iaa7cfd3e11d99fa6854423e70421db78817fbd21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 20:43:24 +00:00
Weilin Xu
050c07c475 Fix null pointer crash in AIDL radio HAL VTS am: cf892db1ef am: e065f848d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24133137

Change-Id: I85df4b07a3e54ea6878c3edc596c3ae240068617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 20:40:09 +00:00
Weilin Xu
e065f848d0 Fix null pointer crash in AIDL radio HAL VTS am: cf892db1ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24133137

Change-Id: I8808c3c3ea0d30914597a5199c15bc3eddc9e723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 19:55:55 +00:00
Eric Biggers
26362ca76c Merge changes from topic "weaver-vts-fix" into main am: 2a5366d850 am: d9769b4af6 am: 84c5619fc8 am: f757356cd2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665203

Change-Id: Ie75e9176ca02f7bc92eb10b9b3c97b122308e4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 19:53:57 +00:00
Eric Biggers
48dc12d758 Clarify the Weaver documentation am: a4742a0291 am: cf07ed821d am: 6ee7a1e6bc am: 4e9c686f5e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665198

Change-Id: I69d5f3f5ae1b1b228b1fc31789e3d8f41d0a37ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 19:53:54 +00:00
Devin Moore
fd43aec9e5 [automerger skipped] Update weaver AIDL default to use V2 am: 316cf58d49 am: 2965a93c24 -s ours am: 90ddb94db2 -s ours am: 3217e5ed22 -s ours
am skip reason: Merged-In Id6aa9316a20541bf2c9a7cc53345a5010a188d00 with SHA-1 daf12d9440 is already in history

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

Change-Id: I06692a0c063764809adb7ba0b0e40de724e4b60c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 19:53:51 +00:00
ChengYou Ho
e187b730a4 [automerger skipped] Add WeaverReadStatus to WeaverReadResponse am: 20c47b4bae am: 43f1c1af5d -s ours am: b9e3b7556f -s ours am: 193d4f4c42 -s ours
am skip reason: Merged-In I83897038eda59ed8cae1bdb0ae68828201615ebc with SHA-1 5c3a2b710e is already in history

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

Change-Id: I9854992c90d0c5543133d7639e08741f4db9451c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 19:53:47 +00:00
Eric Biggers
f757356cd2 Merge changes from topic "weaver-vts-fix" into main am: 2a5366d850 am: d9769b4af6 am: 84c5619fc8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665203

Change-Id: Iad369450339d27d0147e9a9e0e8b647d19133dac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 19:12:44 +00:00
Eric Biggers
4e9c686f5e Clarify the Weaver documentation am: a4742a0291 am: cf07ed821d am: 6ee7a1e6bc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665198

Change-Id: Ia0447b51e346c898dce0fd41762285f0ff2b784b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 19:12:42 +00:00
Devin Moore
3217e5ed22 [automerger skipped] Update weaver AIDL default to use V2 am: 316cf58d49 am: 2965a93c24 -s ours am: 90ddb94db2 -s ours
am skip reason: Merged-In Id6aa9316a20541bf2c9a7cc53345a5010a188d00 with SHA-1 daf12d9440 is already in history

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

Change-Id: I821f658c4d4f8ab9219d8c5a603bafb046aa6e48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 19:12:39 +00:00
ChengYou Ho
193d4f4c42 [automerger skipped] Add WeaverReadStatus to WeaverReadResponse am: 20c47b4bae am: 43f1c1af5d -s ours am: b9e3b7556f -s ours
am skip reason: Merged-In I83897038eda59ed8cae1bdb0ae68828201615ebc with SHA-1 5c3a2b710e is already in history

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

Change-Id: I16814875bab0be900c94de2bfeb6ef4a3b217a16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 19:12:36 +00:00
Eric Biggers
84c5619fc8 Merge changes from topic "weaver-vts-fix" into main am: 2a5366d850 am: d9769b4af6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665203

Change-Id: I20016292f67b65b4e7093ea479fe80c6f29e95de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 18:28:03 +00:00
Eric Biggers
6ee7a1e6bc Clarify the Weaver documentation am: a4742a0291 am: cf07ed821d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665198

Change-Id: I437cdabf4c8e014c27f41dc66500aa10a4508a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 18:27:59 +00:00
Devin Moore
90ddb94db2 [automerger skipped] Update weaver AIDL default to use V2 am: 316cf58d49 am: 2965a93c24 -s ours
am skip reason: Merged-In Id6aa9316a20541bf2c9a7cc53345a5010a188d00 with SHA-1 daf12d9440 is already in history

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

Change-Id: Ib467c4542550f4dccccc5c46ffe6341e21e843c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 18:27:55 +00:00
ChengYou Ho
b9e3b7556f [automerger skipped] Add WeaverReadStatus to WeaverReadResponse am: 20c47b4bae am: 43f1c1af5d -s ours
am skip reason: Merged-In I83897038eda59ed8cae1bdb0ae68828201615ebc with SHA-1 5c3a2b710e is already in history

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

Change-Id: I19bc0b14f56380c7e88d8f43d973f001df6c7495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 18:27:51 +00:00
Eric Biggers
d9769b4af6 Merge changes from topic "weaver-vts-fix" into main am: 2a5366d850
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665203

Change-Id: Ida0015485355ec106c49d91ddbc45cccbcb08684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 17:44:28 +00:00
Eric Biggers
cf07ed821d Clarify the Weaver documentation am: a4742a0291
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665198

Change-Id: I241107ae39fe30112f46b33906a09a6824d31e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 17:44:26 +00:00
Devin Moore
2965a93c24 Update weaver AIDL default to use V2 am: 316cf58d49
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665197

Change-Id: Iaa580ba44e27fc62c4f357a8d9c5f802b2124191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 17:44:23 +00:00
ChengYou Ho
43f1c1af5d Add WeaverReadStatus to WeaverReadResponse am: 20c47b4bae
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665196

Change-Id: Iedb47e19ff9457b178c34dc469f9a872e30492e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 17:44:20 +00:00
Eric Biggers
2a5366d850 Merge changes from topic "weaver-vts-fix" into main
* changes:
  Don't overwrite in-use Weaver slots during VTS
  Simplify Weaver VTS test
  Remove redundant HIDL Weaver VTS test
  Move VtsHalWeaverTargetTest to common directory
  Make VtsHalWeaverTargetTest test both HIDL and AIDL services
  Clarify the Weaver documentation
  Update weaver AIDL default to use V2
  Add WeaverReadStatus to WeaverReadResponse
2023-07-20 16:53:13 +00:00
Mikhail Naganov
6ddefdbcdf audio: Move StreamContext ownership out from StreamCommonImpl
Upcoming implementations of the streams of the primary module
will need to change the underlying stream type depending on
the current connected device. The stream context must persist,
thus its life time must be bound to the IStreamIn/Out implementation.
Move the StreamContext instance under ownership of StreamIn/Out.

Add StreamCommonImpl::onClose so that the owner of the context
may know when it is safe to reset it.

Re-arrange the order of the arguments when creating a stream
so that the context always comes first.

Bug: 264712385
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Iaf13d4bc3a53cbfc27264d3abd1f6c417ece3941
2023-07-19 17:49:28 -07:00
Mikhail Naganov
2eabaf995b audio: Use ChildInterface in StreamCommonImpl
Replace the pair of 'shared_ptr<>, Binder' with
the equivalent ChildInterface.

Fix logging of returned sub-objects to print their
Binder value instead of the local pointer.

Bug: 264712385
Test: m
Change-Id: I1350e7b3720c6244cd8527e1d021ee9577399291
2023-07-19 17:36:37 -07:00
Mikhail Naganov
422f7e6b1b audio: Update StreamAlsa and alsa utils for built-in devices
Use new functions added to alsa proxy layer for opening
attached (built-in) devices.

Bug: 264712385
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Ia2a47ff96fa62f99ce4ec4a0993ca3fd86f82c9d
2023-07-19 17:35:39 -07:00
Mikhail Naganov
f12d4a1ef8 audio: Simplify and extend alsa::Mixer
Remove alsa::MixerControl. tinyALSA contains utility
functions for setting values in percents, they use
the same logic as used to be there for handling
the "volume" control. Use access serialization at
the mixer level, rather than for each control.

Move the call to 'mixer_open' to alsa::Mixer.

Add controls for capture (mic) mute and gain. They
will be used by the primary HAL.

Bug: 264712385
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I0fad994153de96aceec3eb8f2fec19805ec912f8
2023-07-19 17:35:38 -07:00
Max Bires
98f1769a1c Merge "Slight documentation tweak" into main am: fe9355f3c6 am: 514ecb0613 am: a7aadcfbb0 am: 6eae21c2f8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2663916

Change-Id: Ifbd45102c3f2a2df3be435e0fbe64519da1d3a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 23:37:03 +00:00
Max Bires
6eae21c2f8 Merge "Slight documentation tweak" into main am: fe9355f3c6 am: 514ecb0613 am: a7aadcfbb0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2663916

Change-Id: I7385d412d5632314249c07ebf2d42b51a959d42a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 22:52:09 +00:00
Max Bires
a7aadcfbb0 Merge "Slight documentation tweak" into main am: fe9355f3c6 am: 514ecb0613
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2663916

Change-Id: Ib71aab2e9d2f87bf79dcc13fc5f3fc21c95fd1d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 22:07:39 +00:00
Treehugger Robot
abb9754df8 Merge "Require mapper4" into main am: 1da295ca82 am: 1a72ce6fca am: b5d9f4483a am: b607ed9013
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665655

Change-Id: I371dc51006c45c5650a3470b2c6bbc96387bc155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 22:07:39 +00:00
Treehugger Robot
b607ed9013 Merge "Require mapper4" into main am: 1da295ca82 am: 1a72ce6fca am: b5d9f4483a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665655

Change-Id: I23655843e4546b548288d8b6e7cf1ee23f24b6b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 21:26:37 +00:00
Max Bires
514ecb0613 Merge "Slight documentation tweak" into main am: fe9355f3c6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2663916

Change-Id: I3e9406f578a4d1c77e8743ee3d06c3b29a3aeec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 21:25:22 +00:00
Max Bires
fe9355f3c6 Merge "Slight documentation tweak" into main 2023-07-19 20:52:56 +00:00
Treehugger Robot
b5d9f4483a Merge "Require mapper4" into main am: 1da295ca82 am: 1a72ce6fca
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665655

Change-Id: I1aeb2f2d0a98f872c8f0b746c72495c3ee591ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 20:40:09 +00:00
Treehugger Robot
1a72ce6fca Merge "Require mapper4" into main am: 1da295ca82
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665655

Change-Id: Id459a90e232d4459a3ca0f2ff018a8cf81eecb27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 19:57:50 +00:00