Commit Graph

53314 Commits

Author SHA1 Message Date
Hongguang Chen
486de7bc69 Merge "Rename mDNS offload feature name" into android14-tests-dev 2024-01-22 18:13:49 +00:00
Treehugger Robot
f270275c7a Merge "lights aidl: Add required @Rust derive statements" into android14-tests-dev 2024-01-20 11:13:26 +00:00
Hongguang Chen
aee7ba0345 Rename mDNS offload feature name
Bug: 318332352
Test: pm list features
Test: atest android.app.cts.SystemFeaturesTest
Test: atest VtsHalWifiStaIfaceTargetTest
Merged-In: I57d8f955c3f5d39814f36b662fee8d045c8c5150
Change-Id: I57d8f955c3f5d39814f36b662fee8d045c8c5150
2024-01-20 01:49:49 +00:00
Alisher Alikhodjaev
496cc8a5df Per NCI spec there is no need to wait for credits am: 78c233dc03
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2917346

Change-Id: I67ee9b89e2e5de9ffe95ff40490358bb852e3fd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 20:21:37 +00:00
Alisher Alikhodjaev
78c233dc03 Per NCI spec there is no need to wait for credits
One case was missed in the previous fix.
This is an update.

Bug: 312911587
Test: no regressions
Change-Id: I7fefa92d5a66581431288ec902a56ed61e9cf310
(cherry picked from commit 46d9630125)
2024-01-18 17:29:52 +00:00
Treehugger Robot
b4fadec4ff Merge "Modify CameraUseStreamConfigToDisplay" into android13-tests-dev am: 4c7a5de957
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2911485

Change-Id: Ib03e2c8e9b8dd43bca4741dbd1024ab0da6c5f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 04:44:07 +00:00
Treehugger Robot
4c7a5de957 Merge "Modify CameraUseStreamConfigToDisplay" into android13-tests-dev 2024-01-18 04:20:19 +00:00
Treehugger Robot
b4b919688d [automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12-tests-dev am: a3ca13869f -s ours am: d6d89e064c -s ours am: 4ffdc10d06 -s ours
am skip reason: contains skip directive

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

Change-Id: I0307c517f5e8e6ee70b4cd87d704037cf94dfbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:38:54 +00:00
Changyeon Jo
021ac5948a [automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 2180645f10 -s ours am: d9483b87bc -s ours am: 5c95074b1e -s ours
am skip reason: contains skip directive

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

Change-Id: I28df501b09e1023047c7679a234cbb261585c56c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:38:51 +00:00
Treehugger Robot
34f6e19f5e [automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12L-tests-dev am: 294d32e264 -s ours am: 656eae1fb4 -s ours
am skip reason: contains skip directive

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

Change-Id: Ief0362ac588ebf0aaec296687772d7cf823c7f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:38:40 +00:00
Changyeon Jo
f9ce5085f8 [automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 6d9717bcb8 -s ours am: 87f0184973 -s ours
am skip reason: contains skip directive

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

Change-Id: Ib4c0d6fa800a8a68bf1e7800e5353538a9185832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:38:37 +00:00
Treehugger Robot
4ffdc10d06 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12-tests-dev am: a3ca13869f -s ours am: d6d89e064c -s ours
am skip reason: contains skip directive

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

Change-Id: Ic93a8ced0b53c6cc41d222cb5ec4bce70c1ca7de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:37:08 +00:00
Changyeon Jo
5c95074b1e [automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 2180645f10 -s ours am: d9483b87bc -s ours
am skip reason: contains skip directive

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

Change-Id: If0203b4b1365fcf309ae8569186c69163bdfb792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:37:04 +00:00
Treehugger Robot
d6d89e064c [automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12-tests-dev am: a3ca13869f -s ours
am skip reason: contains skip directive

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

Change-Id: I86713e90976e630cb2cd6292ddf4c9e1c872ee8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:16:52 +00:00
Changyeon Jo
d9483b87bc [automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 2180645f10 -s ours
am skip reason: contains skip directive

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

Change-Id: I8ceef31957899a75360a3b48c903b150ce0d9374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:16:49 +00:00
Treehugger Robot
656eae1fb4 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12L-tests-dev am: 294d32e264 -s ours
am skip reason: contains skip directive

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

Change-Id: I84b3704b90874df72711736c3b856f39f223604b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:15:04 +00:00
Changyeon Jo
87f0184973 [automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 6d9717bcb8 -s ours
am skip reason: contains skip directive

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

Change-Id: I9ed70c9066e522953ec7905b86e0d22ac2f3fdb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:14:59 +00:00
Treehugger Robot
a3ca13869f Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12-tests-dev 2024-01-18 02:43:36 +00:00
Treehugger Robot
294d32e264 Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12L-tests-dev 2024-01-18 02:43:36 +00:00
Alisher Alikhodjaev
b2e02bb721 Per NCI spec there is no need to wait for credits am: 17f8882d78
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2912753

Change-Id: I3497cd0cd425f4433b747611dba34beff154e2b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 00:42:54 +00:00
Jayant Chowdhary
23f338bac4 camera vts: Remove redundant capabilities fetch
Bug: 299202800

Test: build

Merged-In: Ia6ca1ee0fb65e357398ba62c6a787c6530b989e4
Change-Id: Ia6ca1ee0fb65e357398ba62c6a787c6530b989e4
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit 571cbf1b4c)
2024-01-17 18:48:49 +00:00
Jayant Chowdhary
5554de2fa8 Check for stream use case capability before stream use case test
Bug: 299202800

Test: Vendor testing

Merged-In: If30ead47072dc1f950b8fb6384072cc38cd51c58
Change-Id: If30ead47072dc1f950b8fb6384072cc38cd51c58
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit da59822642)
2024-01-17 18:33:57 +00:00
Treehugger Robot
990cb24694 Merge "Remove error check for REQUEST_NOT_SUPPRTED" into android14-tests-dev 2024-01-17 18:21:21 +00:00
Alisher Alikhodjaev
17f8882d78 Per NCI spec there is no need to wait for credits
Bug: 312911587
Test: no regresions
Change-Id: Ie7952b6618cd2b191b85904b3c1d4c544ba85618
(cherry picked from commit 93f1bf2bd3)
2024-01-17 08:24:03 +00:00
Treehugger Robot
678a31c32f [automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours am: fcec28ee4c -s ours am: 08af1350ce -s ours am: 7d4805ed3b -s ours
am skip reason: contains skip directive

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

Change-Id: I091b0d56deaf6a7dd378005d3e04faa3ec153bff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-17 03:54:52 +00:00
Changyeon Jo
a54bde0496 [automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours
am skip reason: contains skip directive

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

Change-Id: Iad7425ea5acc23b02e87d3e5d09f46e3bf3a6b59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-17 03:54:48 +00:00
Treehugger Robot
7d4805ed3b [automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours am: fcec28ee4c -s ours am: 08af1350ce -s ours
am skip reason: contains skip directive

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

Change-Id: Id5d47a991d782b737bd14b9eb2bd9f73a150a2de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-17 03:10:18 +00:00
Changyeon Jo
f1cb5e825d [automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours
am skip reason: contains skip directive

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

Change-Id: I605705197f69a9dde2334c5cc74e7eaf5f955107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-17 03:10:15 +00:00
Treehugger Robot
08af1350ce [automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours am: fcec28ee4c -s ours
am skip reason: contains skip directive

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

Change-Id: I3d68b4a7ac48ae0e44303f718c4e18b50039d98c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-17 02:49:21 +00:00
Changyeon Jo
43473d142f [automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours
am skip reason: contains skip directive

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

Change-Id: I1ab6710d4fa6aa41338baabf37392ae1ac3d4cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-17 02:49:19 +00:00
Treehugger Robot
fcec28ee4c [automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours
am skip reason: contains skip directive

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

Change-Id: I403b8ad142a1d73f34cb7e58d3b66a6598aac6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-17 02:05:43 +00:00
Changyeon Jo
7ea8d84859 [automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours
am skip reason: contains skip directive

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

Change-Id: I11c67b1de8d351a1350cb693869d459ba970312a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-17 02:05:40 +00:00
Changyeon Jo
47640027f2 Modify CameraUseStreamConfigToDisplay
Exclude logical camera devices from CameraUseStreamConfigToDisplay test
case.

Bug: 275049370
Test: atest VtsHalEvsV1_0TargetTest and
      atest VtsHalEvsV1_1TargetTest
Change-Id: If6b31d94bdbffd2f4e9ab9bd5c8957ec85904187
(cherry picked from commit d5732b6bbf)
2024-01-17 01:46:07 +00:00
Changyeon Jo
6d9717bcb8 [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay
Exclude logical camera devices from CameraUseStreamConfigToDisplay test
case.

Bug: 275049370
Test: atest VtsHalEvsV1_0TargetTest and
      atest VtsHalEvsV1_1TargetTest
Change-Id: If6b31d94bdbffd2f4e9ab9bd5c8957ec85904187
(cherry picked from commit d5732b6bbf)
2024-01-17 01:34:40 +00:00
Changyeon Jo
2180645f10 [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay
Exclude logical camera devices from CameraUseStreamConfigToDisplay test
case.

Bug: 275049370
Test: atest VtsHalEvsV1_0TargetTest and
      atest VtsHalEvsV1_1TargetTest
Change-Id: If6b31d94bdbffd2f4e9ab9bd5c8957ec85904187
(cherry picked from commit d5732b6bbf)
2024-01-17 01:33:55 +00:00
Treehugger Robot
72b6e65914 Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev 2024-01-17 01:30:09 +00:00
Aditi
bc2a0d5747 Remove error check for REQUEST_NOT_SUPPRTED
Some devices may not support LCE functionality, so remove the condition that cause failures on such devices

Bug : 316570471

Change-Id: I758c82d14da4fec89b2e56f4aeda2a31438718fe
Signed-off-by: Aditi <aditi.parikh@samsung.corp-partner.google.com>
2024-01-17 00:47:04 +00:00
Changyeon Jo
d5732b6bbf [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay
Exclude logical camera devices from CameraUseStreamConfigToDisplay test
case.

Bug: 275049370
Test: atest VtsHalEvsV1_0TargetTest and
      atest VtsHalEvsV1_1TargetTest
Change-Id: If6b31d94bdbffd2f4e9ab9bd5c8957ec85904187
2024-01-16 21:14:30 +00:00
Andres Schafhauser
393ca9ffc2 APF exempt list for TVs to use hardware feature
Instead of expecting MdnsOffloadManagerService to exist which is
correct in principle but VTS fails as use of GSI is required.

Bug: 318332352
Test: atest VtsHalWifiStaIfaceTargetTest
Merged-In: I47453e7ad009b08aadf7c09fc144d2166ef9991b
Change-Id: I47453e7ad009b08aadf7c09fc144d2166ef9991b
2024-01-11 17:12:35 +00:00
Ray Chin
58be11ecc4 Blind scan should be an optional feature based on the design document
Bug: 317215552
Bug: 305118733
Test: cf_x86_tv-staging-userdebug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:740a0a8c5ebd0218139aded763fb3204886c2dd0)
Merged-In: Id0153700cfa2c02933c23e13ca1305b0a96b00ca
Change-Id: Id0153700cfa2c02933c23e13ca1305b0a96b00ca

NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp, hunk HunkHeader[1258,6->1262,10]: Hunk cannot be applied

Original patch:
 From 740a0a8c5e Mon Sep 17 00:00:00 2001
From: Ray Chin <raychin@google.com>
Date: Fri, 22 Dec 2023 19:10:46 +0800
Subject: [PATCH] Blind scan should be an optional feature based on the design document

Bug: 317215552
Bug: 305118733
Test: cf_x86_tv-staging-userdebug
Change-Id: Id0153700cfa2c02933c23e13ca1305b0a96b00ca
---
2023-12-26 10:28:05 +08:00
sadiqsada
71be20f910 Add demux to mFrontendTests am: 86aa7010fd am: 6afaf8d190 am: 123934b067
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886926

Change-Id: I7de5829fa3f3fdaa816516ee057546b29af68e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 23:54:34 +00:00
sadiqsada
123934b067 Add demux to mFrontendTests am: 86aa7010fd am: 6afaf8d190
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886926

Change-Id: I915317c40513987417d4e0de332e1205c2115d11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 23:20:37 +00:00
sadiqsada
6afaf8d190 Add demux to mFrontendTests am: 86aa7010fd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886926

Change-Id: I422f6448d26a5e5f2e7915309636503ac92e2c7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 22:49:41 +00:00
Sadiq Sada
f91c15c69e Merge "Add demux to mFrontendTests" into android14-tests-dev 2023-12-21 22:16:14 +00:00
sadiqsada
86aa7010fd Add demux to mFrontendTests
aosp/2640754 adds a tuneFrontend call with testWithDemux enabled.
tuneFrontend() has some logic that calls DvrTests->openDvrInDemux()
which requires mDemux to be available, but mFrontendTests does not
have an associated demux. This CL adds a demux resource.

Bug: 317268814
Test: atest VtsHalTvTunerV1_1TargetTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e7c5595ee5cfe79eb181e60399d8d857526d1af7)
Merged-In: I62ad038829ca3ed0ecc077527197eec444a5eb12
Change-Id: I62ad038829ca3ed0ecc077527197eec444a5eb12
2023-12-20 22:51:16 +00:00
sadiqsada
630a974006 Add demux to mFrontendTests
aosp/2640754 adds a tuneFrontend call with testWithDemux enabled.
tuneFrontend() has some logic that calls DvrTests->openDvrInDemux()
which requires mDemux to be available, but mFrontendTests does not
have an associated demux. This CL adds a demux resource.

Bug: 317268814
Test: atest VtsHalTvTunerTargetTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e75c56787a1a9cd6280ab758788bc810ff50cb58)
Merged-In: I3eb69d8dc10cd2cdbb2d3526317faee2909787f5
Change-Id: I3eb69d8dc10cd2cdbb2d3526317faee2909787f5
2023-12-20 22:14:31 +00:00
Peter Lin
70d2ef6b34 [VTS] Update SetDisplayBrightness test item
Ensure the primary display power on before run the
SetDisplayBrightness test item.

Bug: 313794734
Test: atest VtsHalGraphicsComposer3_TargetTest:PerInstance/
      GraphicsComposerAidlCommandTest#SetDisplayBrightness/
      0_android_hardware_graphics_composer3_IComposer_default
      -- --abi arm64-v8a
Change-Id: I94fb700704bcbd8543f2a608dd75b9e745e40e37
Merged-In: I94fb700704bcbd8543f2a608dd75b9e745e40e37
2023-12-20 06:49:27 +00:00
Treehugger Robot
dc0acfbbfe Merge "Test: Don't check results when no type-c ports" into android13-tests-dev am: 6ec8db6abe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2635482

Change-Id: I4e6ecc5d9ac4da453d58d0f09e19c4a4bde090b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-15 03:18:16 +00:00
Treehugger Robot
6ec8db6abe Merge "Test: Don't check results when no type-c ports" into android13-tests-dev 2023-12-15 02:41:47 +00:00
Jesus Sanchez-Palencia
017972d2d1 lights aidl: Add required @Rust derive statements
The new LightsService example is written in Rust and is being expanded
to include a state as part of the service. This required that HwLight
and HwLightState derived from the Copy and Clone traits, so here we are
updating the AIDL Rust bindings.

This is not an API change, so in order to avoid having to bump the AIDL
API version for this HAL we used the hash_gen.sh script as below:

$ m android.hardware.light-update-api
$ m android.hardware.light-freeze-api

$ vim light/aidl/Android.bp # removed frozen_api argument and the newly
created version 3 block

$ cp -r aidl_api/android.hardware.light/3/* aidl_api/android.hardware.light/2/
$ rm -rf aidl_api/android.hardware.light/3/

$ ./system/tools/aidl/build/hash_gen.sh  \
      hardware/interfaces/light/aidl/aidl_api/android.hardware.light/2/  \
      1  \
      hardware/interfaces/light/aidl/aidl_api/android.hardware.light/2/.hash

Tested: Verified that the build is passing and used with the next CL.
Bug: 286106270
Change-Id: I1400ec1db1e75595176a5656d6688df9457153d4
(cherry picked from commit ea05baf338)
2023-12-11 05:43:45 +00:00