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

61178 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jimmy Shiu
e5b8c16f7d Merge "Power: add a DISPLAY_CHANGE mode" into main 2023-10-03 14:57:42 +00:00
Tang Lee
cc29bdd2d3 Merge "Return ILLEGAL_ARGUMENT for setting null callback" into main 2023-10-03 03:14:52 +00:00
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
42888696e1 audio: Set 'maxOpenStreamCount' to unlimited for input ports am: 8dbc51158f am: 81b8fb2841 am: 9fa5515ad7 am: f0102fff01 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2768032

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

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

Change-Id: If097fc0794b2ca21f7906dace12d5f5d0ce4def5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 00:32:07 +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
64063c3ff9 Merge changes I7df6e323,I0e3412b9 into main am: 0da62dd023 am: 63d294c196 am: 3758b9a613 am: 2723db3708 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2767897

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

Change-Id: I944bc7f9252bc6e7500d635d4a61bd6b05bd059c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-02 21:36:12 +00:00
Mikhail Naganov
3758b9a613 Merge changes I7df6e323,I0e3412b9 into main am: 0da62dd023 am: 63d294c196 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2767897

Change-Id: I88a3510fd88ea733b6675400bbb16db5f424867c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-02 21:03:39 +00:00
Yuncheol Heo
7ceb25ff52 Merge "Add CLUSTER_HEARTBEAT to VHAL" into main 2023-10-02 20:38:48 +00: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
Treehugger Robot
b565d988c4 Merge "Remove remoteaccess V1 impl." into main 2023-10-02 19:31:44 +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
Michael Stokes
f9fcfe3794 Merge "Revert "Convert from HIDL mapper to libui GraphicBufferMapper"" into main 2023-10-02 10:21:06 +00:00
Michael Stokes
49ba82ce11 Revert "Convert from HIDL mapper to libui GraphicBufferMapper" 
Revert submission 24747509-camera_fail2

Reason for revert: DroidMonitor-triggered revert due to breakage
b/302990858.

This may cause CtsAppOpsTestCases b/300115646 to fail again,
unfortunately (b/300115646).

Bug: 302990858
Reverted changes: /q/submissionid:24747509-camera_fail2

Change-Id: I0191b3ee88846f5b2c6e37ebd6be6d1369d9dba9
 2023-10-02 09:56:59 +00:00
Tang Lee
4be4471d46 Return ILLEGAL_ARGUMENT for setting null callback 
Bug: 299182872
Test: Run VTS with external USB camera
vts-tradefed
> run vts -m VtsAidlHalCameraProvider_TargetTest -t \
    PerInstance/CameraAidlTest#setCallback/0_android_hardware_camera_provider_ICameraProvider_external_0 \
    --logcat-on-failure --logcat-on-failure-size 8192000 \
    --bugreport-on-failure --screenshot-on-failure

Change-Id: I013e3770ddbdcf6475e0927449af6183dcc37a8e
 2023-10-02 07:18:16 +00:00
Treehugger Robot
c5b1d7d1b0 Merge "Revert "Add bootcontrol HAL APEX"" into main am: ac9f70ee2f am: 3beb387558 am: d29b94b7a0 am: 322a636b99 am: 844c90145e 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2766666

Change-Id: Ib5145592b26f341297ccd8e917cebc0d34092c25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-30 08:21:31 +00:00
Treehugger Robot
844c90145e Merge "Revert "Add bootcontrol HAL APEX"" into main am: ac9f70ee2f am: 3beb387558 am: d29b94b7a0 am: 322a636b99 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2766666

Change-Id: I9ea1daa00df0a0a2f0c1bf00d896e75c4741ac38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-30 07:05:23 +00:00
Treehugger Robot
322a636b99 Merge "Revert "Add bootcontrol HAL APEX"" into main am: ac9f70ee2f am: 3beb387558 am: d29b94b7a0 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2766666

Change-Id: I1850b62715cbaa9e181d0261fdbccaee94ba6906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-30 06:17:33 +00:00
Treehugger Robot
d29b94b7a0 Merge "Revert "Add bootcontrol HAL APEX"" into main am: ac9f70ee2f am: 3beb387558 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2766666

Change-Id: I4aef9d19ab857b9e39f70a4ab6c2de768063d316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-30 05:15:19 +00:00
Treehugger Robot
3beb387558 Merge "Revert "Add bootcontrol HAL APEX"" into main am: ac9f70ee2f 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2766666

Change-Id: Ie25e8545f086c130c56ed6709d89330ac4a11306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-30 04:07:43 +00:00
Treehugger Robot
ac9f70ee2f Merge "Revert "Add bootcontrol HAL APEX"" into main 2023-09-30 03:34:45 +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
Gabriel Biren
8f9811ebae [automerger skipped] Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 am: 90bb1142d6 am: 95a394109f am: 7ea65f793b -s ours am: 538bc27f89 -s ours 
am skip reason: Merged-In I5ea7f00cfebf79021185f66766454d053c973b31 with SHA-1 2236b96bf4 is already in history

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

Change-Id: I34cdf4681192dc77e8d6e9070298d9bf55c1c05c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 21:53:10 +00:00
Gabriel Biren
d3d9e07ed9 [automerger skipped] Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 am: 90bb1142d6 -s ours am: ee45cce2ea -s ours am: f89475aeeb -s ours am: 207e2a271c -s ours 
am skip reason: Merged-In I5ea7f00cfebf79021185f66766454d053c973b31 with SHA-1 46538346af is already in history

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

Change-Id: I41fcba6535eb9805989f1569ba4978b3df91e690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 21:52:27 +00:00
Gabriel Biren
d113489374 [automerger skipped] Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 am: 90bb1142d6 am: 95a394109f -s ours am: b93408fd34 -s ours am: 6f37932a3b -s ours 
am skip reason: Merged-In I5ea7f00cfebf79021185f66766454d053c973b31 with SHA-1 46538346af is already in history

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

Change-Id: Iac3b12a7a3bfd3cbab8c5617b1a1122234fbc1a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 21:51:38 +00:00
Gabriel Biren
538bc27f89 [automerger skipped] Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 am: 90bb1142d6 am: 95a394109f am: 7ea65f793b -s ours 
am skip reason: Merged-In I5ea7f00cfebf79021185f66766454d053c973b31 with SHA-1 2236b96bf4 is already in history

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

Change-Id: Ic688b39bd0df0f04f91eca8805a5265d7f57d950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 20:45:34 +00:00
Gabriel Biren
207e2a271c [automerger skipped] Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 am: 90bb1142d6 -s ours am: ee45cce2ea -s ours am: f89475aeeb -s ours 
am skip reason: Merged-In I5ea7f00cfebf79021185f66766454d053c973b31 with SHA-1 46538346af is already in history

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

Change-Id: I27921fad35765b10c737ea8303dbc5f0fc75fc05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 20:35:42 +00:00
Gabriel Biren
6f37932a3b [automerger skipped] Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 am: 90bb1142d6 am: 95a394109f -s ours am: b93408fd34 -s ours 
am skip reason: Merged-In I5ea7f00cfebf79021185f66766454d053c973b31 with SHA-1 46538346af is already in history

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

Change-Id: Ib8cec22732b878da7fb95a153036bb8562e04f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 20:34:57 +00:00
Gabriel Biren
3db93389fc [automerger skipped] Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 am: 90bb1142d6 am: 54fce85081 -s ours 
am skip reason: Merged-In I5ea7f00cfebf79021185f66766454d053c973b31 with SHA-1 46538346af is already in history

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

Change-Id: Ia17d847c60ff073bd640cb6eaeff06d582d17d79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 19:49:36 +00:00
Gabriel Biren
f89475aeeb [automerger skipped] Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 am: 90bb1142d6 -s ours am: ee45cce2ea -s ours 
am skip reason: Merged-In I5ea7f00cfebf79021185f66766454d053c973b31 with SHA-1 46538346af is already in history

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

Change-Id: I70fa6bc66c8ac69daf9b67d3b381716c8c415081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 19:48:00 +00:00
Gabriel Biren
b93408fd34 [automerger skipped] Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 am: 90bb1142d6 am: 95a394109f -s ours 
am skip reason: Merged-In I5ea7f00cfebf79021185f66766454d053c973b31 with SHA-1 46538346af is already in history

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

Change-Id: Ibb4c0575c08fd83aae96cb5b7ddbdfd277a5e72a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 19:46:07 +00:00
Gabriel Biren
7ea65f793b Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 am: 90bb1142d6 am: 95a394109f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24859125

Change-Id: I0ce9e711cdd6e702e17bfa86050b08ddd509b4e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 19:35:49 +00:00
Hugo Drumond Jacob
de83fc07ea Merge "Adjust path to sdv_ivi_cf" into udc-qpr-dev-plus-aosp am: 2b26c3efe1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24850519

Change-Id: I2eff63d0dab366c4e0c33f0c4cf022652d80c9f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 18:42:04 +00:00
Gabriel Biren
95a394109f Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 am: 90bb1142d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24859125

Change-Id: I82186b9eb4dbab9e0b6ceb5bd7d1b81535aa84be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 18:37:15 +00:00
Gabriel Biren
54fce85081 Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 am: 90bb1142d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24859125

Change-Id: I943d7d24c31ac6e24cf38146496012ba5f8effaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 18:34:31 +00:00
Gabriel Biren
ee45cce2ea [automerger skipped] Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 am: 90bb1142d6 -s ours 
am skip reason: Merged-In I5ea7f00cfebf79021185f66766454d053c973b31 with SHA-1 46538346af is already in history

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

Change-Id: I5971bde668107c816371243c306894038c09597d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 18:30:54 +00:00
Hugo Drumond Jacob
2b26c3efe1 Merge "Adjust path to sdv_ivi_cf" into udc-qpr-dev-plus-aosp 2023-09-29 17:51:41 +00:00
Gabriel Biren
90bb1142d6 Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev am: 2a7fc95f69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24859125

Change-Id: I59bfb277bfa68798762019a228711df3a5ab06a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 17:26:42 +00:00
Gabriel Biren
2a7fc95f69 Merge "Disable Wi-Fi framework during VTS" into stage-aosp-udc-ts-dev 2023-09-29 16:45:25 +00:00
Devin Moore
b22961072f Merge "Convert from HIDL mapper to libui GraphicBufferMapper" into main 2023-09-29 14:57:02 +00: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
b745184373 Merge "Audio : Add OpenInputMultipleTimes VTS for r_submix" into main am: afdfa1d079 am: 35a06a8adc am: 45c99de596 am: 91a5e08d41 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2762796

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

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

Change-Id: I9b450b34400c236f8f44522a8a791209d5c6ab83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 22:50:40 +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