Commit Graph

2452 Commits

Author SHA1 Message Date
Mikhail Naganov
1f2e56eded audio: Set 'maxOpenStreamCount' to unlimited for input ports am: 8dbc51158f am: 81b8fb2841 am: 9fa5515ad7 am: f0102fff01 am: 42888696e1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2768032

Change-Id: Id339372f6ca5a62d7c42199221b5cac450823d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 02:06:31 +00:00
Mikhail Naganov
81b8fb2841 audio: Set 'maxOpenStreamCount' to unlimited for input ports am: 8dbc51158f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2768032

Change-Id: I0f917bd3a39d08659e7b6d9c49ea4cc03f7c2db6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 23:58:05 +00:00
Mikhail Naganov
889a4d95e7 Merge changes I7df6e323,I0e3412b9 into main am: 0da62dd023 am: 63d294c196 am: 3758b9a613 am: 2723db3708 am: 64063c3ff9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2767897

Change-Id: I129d8e6d095a0e3d943558e14b0adbeab304f84b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 22:39:54 +00:00
Mikhail Naganov
8dbc51158f audio: Set 'maxOpenStreamCount' to unlimited for input ports
Since libaudiohal@aidl reports that the most current legacy C API
version is supported by the HAL, the audio server uses a different
logic for telephony scenarios than for the HIDL HAL. This involves
opening more streams on the same mix port. Allow opening
an unlimited number of streams. However, keep the number of active
streams to be `1`.

Bug: 302132812
Test: atest CtsMediaAudioTestCases --test-filter=".*AudioNativeTest.*"
Test: atest CtsMediaAudioTestCases --test-filter=".*CallAudioInterceptionTest.*"
Change-Id: I896398fca73f28d28d9397d00751394c969531b4
2023-10-02 15:19:03 -07:00
Mikhail Naganov
63d294c196 Merge changes I7df6e323,I0e3412b9 into main am: 0da62dd023
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2767897

Change-Id: I5def5e9262b8dfec9131f2d2bd184634956e6aae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 19:56:23 +00:00
Mikhail Naganov
0da62dd023 Merge changes I7df6e323,I0e3412b9 into main
* changes:
  audio: Fix notification of streams of the device change
  audio: Fix update of an existing patch
2023-10-02 18:06:44 +00:00
Mikhail Naganov
89a8ea964d audio: Fix notification of streams of the device change
Replace the incorrect logic which was considering each
port individually with the correct logic which considers
a connection of a mix port to device ports.

Bug: 302573756
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I7df6e32315945897d88923ea4d9744e590e85dfd
2023-09-29 17:05:23 -07:00
Mikhail Naganov
dc41773ba3 audio: Fix update of an existing patch
The code for updating the existing patch did not modify
the patch stored in the module's list of patches.

Added a test which switches the patch to another port
config and validates that 'Module.getAudioPatches' returns
the updated patch.

Bug: 302573756
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I0e3412b9387cd451436a48af116dc5a940d868cf
2023-09-29 17:05:13 -07:00
Treehugger Robot
cf8ed2390f Merge "Audio : Add OpenInputMultipleTimes VTS for r_submix" into main am: afdfa1d079 am: 35a06a8adc am: 45c99de596 am: 91a5e08d41 am: b745184373
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2762796

Change-Id: I3564b3044ce5639216ff5424370ddeac81a91e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 01:54:47 +00:00
Treehugger Robot
35a06a8adc Merge "Audio : Add OpenInputMultipleTimes VTS for r_submix" into main am: afdfa1d079
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2762796

Change-Id: I466944898bbcc4e2c9b5e6f43994bee0a49b6b0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 21:43:47 +00:00
Treehugger Robot
afdfa1d079 Merge "Audio : Add OpenInputMultipleTimes VTS for r_submix" into main 2023-09-28 20:53:33 +00:00
Shraddha Basantwani
21980e5196 Audio : Add OpenInputMultipleTimes VTS for r_submix
Bug: 286914845
Test: atest AudioModuleRemoteSubmix

Change-Id: I8ae78db42274d8e17408ad6d5300cda7de134985
2023-09-28 07:20:30 +00:00
Mikhail Naganov
53b40f1a91 Merge "audio: Align Module::getMmapPolicyInfos behavior with legacy" into main am: b9c4bd4ea5 am: a4998f64cd am: 07fccbdcdb am: 8ebfc9a848 am: 05126c482d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2763851

Change-Id: Ic3f75ffe3dc7cfca186faab99be3444252c266b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 02:02:35 +00:00
Mikhail Naganov
a4998f64cd Merge "audio: Align Module::getMmapPolicyInfos behavior with legacy" into main am: b9c4bd4ea5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2763851

Change-Id: I2d35697637c6a8ff08eecd48b5dd44faae11bfc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 21:49:37 +00:00
Mikhail Naganov
8506491475 audio: Align Module::getMmapPolicyInfos behavior with legacy
When there are no device ports supporting MMAP,
Module::getMmapPolicyInfos have to return 'Policy::NEVER'
so that the AAudio code does not attempt to use
the AAudio service. This aligns with the use of sysprops
by the HIDL implementation.

Update AudioCoreModule#GetMmapPolicyInfos test to use
the same logic for determining MMAP support as the framework
uses.

This makes CtsNativeMediaAAudioTest cases passing with
the AIDL HAL on Cuttlefish.

Bug: 302049825
Test: atest VtsHalAudioCoreTargetTest
Test: atest CtsNativeMediaAAudioTest [w/AIDL enabled on CF]
Change-Id: Ie58c408f6f648a8a03b6a5d92118b90061389c50
2023-09-26 17:20:58 -07:00
Mikhail Naganov
ccf96925f7 Merge "audio: Fix connection between alsa_device_profile and _proxy" into main am: f69e0b6795 am: 4991074eba am: e6e1a30685 am: e1c3c4f221 am: 5aaaaccb27
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2760046

Change-Id: Ibd23624ba8c743004815ba43cd9e1bc1488f808a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 21:04:11 +00:00
Mikhail Naganov
4991074eba Merge "audio: Fix connection between alsa_device_profile and _proxy" into main am: f69e0b6795
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2760046

Change-Id: I1203693e0bd17f89326b99b7ff60c4fea75809d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 17:11:27 +00:00
Mikhail Naganov
f69e0b6795 Merge "audio: Fix connection between alsa_device_profile and _proxy" into main 2023-09-25 16:00:00 +00:00
Treehugger Robot
c133a32f60 Merge "audio: Fix Effect worker thread" into main am: 542110eebe am: b616f1844b am: 47566912ef am: 62d5cbebf7 am: d2a71839bd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2757106

Change-Id: I22e042922cdfba4997a72f8df21dc7df7a0d30f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 20:56:32 +00:00
Treehugger Robot
b616f1844b Merge "audio: Fix Effect worker thread" into main am: 542110eebe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2757106

Change-Id: I61aa81f240dac4184c1600b624b4f8d27756ef6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 17:16:53 +00:00
Treehugger Robot
542110eebe Merge "audio: Fix Effect worker thread" into main 2023-09-22 16:40:06 +00:00
Mikhail Naganov
5d2bfbac33 audio: Fix connection between alsa_device_profile and _proxy
alsa_device_proxy keeps a pointer to alsa_device_proxy,
but does not own it. Thus, the lifetime of the proxy must
be no less than of the proxy. In the legacy USB HAL impl
they were stored together (struct alsa_device_info).
Implement an equivalent class (DeviceProxy) in ALSA utils.

Bug: 264712385
Bug: 298712227
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I4e36701752afb3f35664b6f2ad1acda5719be1ea
2023-09-21 17:44:54 -07:00
Treehugger Robot
aafa93b626 Merge changes I34db56fe,I539b408f,I76155f89 into udc-qpr-dev am: 83dcb849d7 am: d7ba06c414
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24816701

Change-Id: Ie566b2ab8279aa9b87e5803ad7780133d763b119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 22:20:33 +00:00
Shunkai Yao
dcfc268767 Merge "Effect AIDL: correct some code format" into main am: 697e3f89a7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2757992

Change-Id: Ie617eee8dbf3eda1c2c90d4014d1fe0a0e359d79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 21:23:33 +00:00
Treehugger Robot
d7ba06c414 Merge changes I34db56fe,I539b408f,I76155f89 into udc-qpr-dev am: 83dcb849d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24816701

Change-Id: Ieaf64d15383104f0200dbd2c97a177762a0061ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 21:22:49 +00:00
Shunkai Yao
8771cecb99 Effect AIDL: correct some code format
Bug: 300735428
Test: atest VtsHalAudioEffectTargetTest
Change-Id: Ic4c925ea14e08418e56ad108468f61b049280f70
2023-09-21 17:58:42 +00:00
Jaideep Sharma
632b1cd048 audio: Fix Effect worker thread
When a effect is closed and reopened from framework,
mExit and mStop states are not reset,that causes
threadloop to exit and eventually blocks framework
as FMQs are never filled from effects HAL.

Reset the state of mExit and mStop on every time when
thread is created, so open->close->open kind of
scenarios can be handled.

Bug: 301214647
Test: run vts-hal-audio

Change-Id: If54c8fa62827e5f28e620dd841d638028149b1b8
2023-09-21 03:11:00 +00:00
Shunkai Yao
97edf6051d Effect AIDL: correct some code format
Bug: 300735428
Test: atest VtsHalAudioEffectTargetTest
Change-Id: I34db56fe6ac203d1ac48202ba1f66dcc36e89262
2023-09-20 22:43:41 +00:00
Shunkai Yao
2d3112f2e3 Effect AIDL: Skipping vts test case if its not supported by effect
Check audioModeIndication/audioSourceIndication/volume flags and only
test if they are supported

Bug: 300735428
Test: atest VtsHalAudioEffectTargetTest
Change-Id: I539b408fcdb73c25984ec8f39b401475a3ccab69
Merged-In: I539b408fcdb73c25984ec8f39b401475a3ccab69
2023-09-20 22:40:22 +00:00
Jaideep Sharma
7f9c8ae6d9 vts: Don't excercise data path for offloaded/bypass effects
Incase of offload effects or effects running in bypass mode
data is not handled by effect module, in those cases skip the
testcases to excercise data path.

Bug: 287590880
Test: run vts -m VtsHalAudioEffectTargetTest

Change-Id: I76155f8997b415bc96242f995ccc2e33c8989dc5
Merged-In: I76155f8997b415bc96242f995ccc2e33c8989dc5
2023-09-20 22:40:22 +00:00
Treehugger Robot
94adf92ee4 Merge "Effect AIDL: Skipping vts test case if its not supported by effect" into main am: 4f2a709416 am: c39ed27778 am: 0fd7e58f72 am: 1755cbbafa am: 6155ea60ce
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2755205

Change-Id: I63d11e5cc08ba3d95828df155423ce8fc7cc9096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:16:44 +00:00
Treehugger Robot
c39ed27778 Merge "Effect AIDL: Skipping vts test case if its not supported by effect" into main am: 4f2a709416
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2755205

Change-Id: Iabf41d3f3b8ad56a106da445fcf613788d142e63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 17:38:17 +00:00
Treehugger Robot
4f2a709416 Merge "Effect AIDL: Skipping vts test case if its not supported by effect" into main 2023-09-20 16:57:23 +00:00
Shunkai Yao
92cd748451 Effect AIDL: Skipping vts test case if its not supported by effect
Check audioModeIndication/audioSourceIndication/volume flags and only
test if they are supported

Bug: 300735428
Test: atest VtsHalAudioEffectTargetTest
Change-Id: I539b408fcdb73c25984ec8f39b401475a3ccab69
2023-09-19 21:31:22 +00:00
Treehugger Robot
9bb4500e9d Merge "audio: Match the r_submix configuration to the legacy impl" into main am: 65747f7ccb am: cb1900c8a7 am: 51b76290be am: db87886e8b am: 3d7c27ab1b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2755271

Change-Id: Ib50306cc11ab350dc9f3ecc6f87d80c3e81c2431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 04:32:21 +00:00
Treehugger Robot
cb1900c8a7 Merge "audio: Match the r_submix configuration to the legacy impl" into main am: 65747f7ccb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2755271

Change-Id: I480ad6a21f409bdbe86096ee38916ed6e4ba2c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:51:28 +00:00
Mikhail Naganov
21d4b9608a audio: Match the r_submix configuration to the legacy impl
The legacy configuration was interesting because although the
xml config file only listed 48000 Hz SR and
AUDIO_CHANNEL_OUT_STEREO channel mask, the implementation
allowed a range of SRs and MONO channel mask. The framework was
liberally allowing requests for other SRs to go to the r_submix
HAL, even without having them listed in the xml config
file. However, since libaudiohal@aidl is more strict in matching
configuration requests to port capabilities, we need to list all
channels masks and SRs suported by the legacy HAL explicitly.

However, we need to limit the amount of profiles to avoid
extra load when passing them via AudioPolicyService.listAudioPorts,
thus remove other PCM types.

Also, to match the hard limit on the number of routes in the legacy
implementation, set "maxOpen/ActiveStreamCount" for mix ports.

Bug: 286914845
Bug: 300990644
Test: atest VtsHalAudioCoreTargetTest
Test: atest android.media.audio.cts.AudioPlaybackCaptureTest
Change-Id: I4a8c7d016662d92ab5e73bc67d94aaac6570e59a
2023-09-18 17:35:52 -07:00
Mikhail Naganov
a14e198f19 Merge "audio: Improve testing of point-to-point connections" into main am: 049a82e5d9 am: f494fb43a9 am: 3949d40c42 am: 34fe78c41b am: 18735828c8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2753112

Change-Id: I8b014a7c99695f5141d84bba5607393ab7222e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 20:31:27 +00:00
Mikhail Naganov
426b876266 audio: Improve testing of point-to-point connections
Point-to-point connections (analog, HDMI, SPDIF) do not use
a device address. Reflect that in `GenerateUniqueDeviceAddress`.
Add an analog headset into the test configuration.

Bug: 300648357
Test: atest VtsHalAudioCoreTargetTest
(cherry picked from https://android-review.googlesource.com/q/commit:fe47b00628a5a9092455d370709ed63cc6b9305a)
Merged-In: Id1d0b1b60df40c2474fe3151067152b8e0a261c3
Change-Id: Id1d0b1b60df40c2474fe3151067152b8e0a261c3
2023-09-18 18:47:17 +00:00
Mikhail Naganov
1f8c3b6f3f audio: Mitigate double receiving of the "exit" command
In rare cases, a worker thread from a new stream created
via StreamSwitcher can read again from the command FMQ
the "exit" command which was sent to the worker of
the previous stream.

The underlying reason for that has to be investigated.
For now, mitigate the issue by salting the cookie of
the "exit" command with the worker's TID.

Bug: 300130515
Test: atest VtsHalAudioCoreTargetTest
(cherry picked from https://android-review.googlesource.com/q/commit:0e7bcae462e05dbdf4ef797365f9414437914bd7)
Merged-In: Ie7d2e847e8b39414ffd31afd64e32d4c9a292c03
Change-Id: Ie7d2e847e8b39414ffd31afd64e32d4c9a292c03
2023-09-18 18:47:04 +00:00
Shraddha Basantwani
4329d375fe Audio : Add 3 VTS test cases for remote submix module
1. OutputDoesNotBlockWhenNoInput
2. OutputDoesNotBlockWhenInputStuck
3. OutputAndInput

Bug: 286914845
Test: atest AudioModuleRemoteSubmix
(cherry picked from https://android-review.googlesource.com/q/commit:343db5e85e5e78e13179872e535c2248989cf081)
Merged-In: I19a08bf2bf39131a70a867280c758b5ef001c024
Change-Id: I19a08bf2bf39131a70a867280c758b5ef001c024
2023-09-18 18:46:55 +00:00
Shraddha Basantwani
e8ae75d310 r_submix : Fix minor issues in AIDL implementation
1. Update refinePosition for output stream
2. Add missing exitStandby on transfer
3. Add check for availableToRead in read functionality

Bug: 286914845
Test: atest VtsHalAudioCoreTargetTest
(cherry picked from https://android-review.googlesource.com/q/commit:95f9232923139f38d802054f5df27a73f1328a09)
Merged-In: Ibab914e5e09474c2b55a6c64cc004ebc1bb6cb47
Change-Id: Ibab914e5e09474c2b55a6c64cc004ebc1bb6cb47
2023-09-18 18:46:47 +00:00
Shunkai Yao
1a828f1f95 Avoid sub_overflow_minimal in AIDL effects VTS
Bug: 299385610
Test: atest VtsHalHapticGeneratorTargetTest
(cherry picked from https://android-review.googlesource.com/q/commit:5ed80c5144d6b0e9064e7c5a34343de29d6f431e)
Merged-In: I1721fb87dd373a40453505733c8aaee647b4cf3b
Change-Id: I1721fb87dd373a40453505733c8aaee647b4cf3b
2023-09-18 18:46:38 +00:00
Mikhail Naganov
2dc898026a audio: Properly support external device port with static configs
External device ports might not have dynamic profiles, for example,
ports for BT devices. Properly handle this case in the default
implementation.

Bug: 264712385
Test: atest VtsHalAudioCoreTargetTest
Test: atest audiosystem_tests
(cherry picked from https://android-review.googlesource.com/q/commit:fcf980e586d9b0f5ad09ba9098cd2c77911526b4)
Merged-In: I8d4bcbf6ccf2ba05436e68e3ba94567fc7610eb7
Change-Id: I8d4bcbf6ccf2ba05436e68e3ba94567fc7610eb7
2023-09-18 18:46:29 +00:00
Shunkai Yao
9a4436477f Remove unused file EffectWorker.h
Bug: 299213582
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:5b8638c66c2113d13a2aaef505fa7a60b95f3811)
Merged-In: I9ffd2e4e1cf1fbca69650eb101812db2ed3acc6f
Change-Id: I9ffd2e4e1cf1fbca69650eb101812db2ed3acc6f
2023-09-18 18:46:19 +00:00
Shunkai Yao
2e53f30f72 Remove the limitation of max open streams
Bug: 295055755
Test: atest CtsMediaAudioTestCases
(cherry picked from https://android-review.googlesource.com/q/commit:2461891a1c7cc29352e82cb6fd1f23587422aa28)
Merged-In: Ifc0bec23ccc2845657389783194eb18fcc7884fa
Change-Id: Ifc0bec23ccc2845657389783194eb18fcc7884fa
2023-09-18 18:46:01 +00:00
Mikhail Naganov
e59a6ce2e0 audio: Make IConfig.getSurroundSound default implementation more robust
In the case when there is a problem with the legacy APM XML file,
the converter provides a default surround sound config. However,
the default implementation of IConfig::getSurroundSoundConfig did
not take an advantage of that, and was returning an empty config,
which is not accepted by VTS.

Also, improve logging messages: clarify the situation when no readable
audio policy XML file found, and use outer functions name for lambdas.

Bug: 293978054
Test: atest VtsHalAudioCoreTargetTest
(cherry picked from https://android-review.googlesource.com/q/commit:1e25ef808f5e6a29d2a889213f4b42cf58ecdc29)
Merged-In: Iae069a0498009605ef5ededb9c9112efab08548a
Change-Id: Iae069a0498009605ef5ededb9c9112efab08548a
2023-09-18 18:45:51 +00:00
Mikhail Naganov
f494fb43a9 Merge "audio: Improve testing of point-to-point connections" into main am: 049a82e5d9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2753112

Change-Id: I2bd9cef92786b85abe73d6092ea6960ec8c27d91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 17:06:02 +00:00
Mikhail Naganov
fe47b00628 audio: Improve testing of point-to-point connections
Point-to-point connections (analog, HDMI, SPDIF) do not use
a device address. Reflect that in `GenerateUniqueDeviceAddress`.
Add an analog headset into the test configuration.

Bug: 300648357
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Id1d0b1b60df40c2474fe3151067152b8e0a261c3
2023-09-15 18:58:17 -07:00
Mikhail Naganov
172c77f6bf Merge "audio: Fix handling of external devices disconnection" into main am: a39e854ef5 am: e3b1829528 am: 7728862742 am: 2d5f915b7d am: 913c04bfab
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2751285

Change-Id: If1314766df549d4e2dddf5f3815e15fc9ce3893a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:26:19 +00:00