Commit graph

367 commits

Author SHA1 Message Date
Alex Buynytskyy
ec1198d941 UpsideDownCake is now 34
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I832ab7a8b5445ba85e27bbcf5be64906bfa0e5be
2023-04-07 23:41:20 +00:00
Treehugger Robot
4a619462af Merge "VtsHalMediaOmx: fix OmxCodecAllowedTest to match requirement" am: 28d4f75dd0 am: 7d9873d019 am: 64da566f72
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2243207

Change-Id: I5d267e871c14292c0de71ec1d63825b995027f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:43:21 +00:00
Wonsik Kim
db13ce5daf VtsHalMediaOmx: fix OmxCodecAllowedTest to match requirement
Bug: 249043823
Bug: 251553217
Test: atest VtsHalMediaOmxV1_0TargetStoreTest
Change-Id: I8015d559d8e7d88a32d1970102167fe4d7566c51
2023-02-28 10:45:55 -08:00
Sungtak Lee
a8c9aa3173 android.hardware.media.c2: Move to staging/
Bug: 254050314
Test: m
Change-Id: I4bc2c0b59453240f0638ccaa2f911ec8423e930d
2023-02-16 00:53:02 +00:00
Sungtak Lee
76937c6533 AIDL BufferPool implementation (HIDL -> AIDL)
Bug: 254050250
Test: m
Change-Id: I0d7bae2c01bd480d1e99f4b39c4a9013a2828897
2022-12-20 08:52:32 +00:00
Sungtak Lee
8fc3ca470d AIDL bufferpool implementation (just copy from HIDL impl)
Bug: 254050250
Change-Id: I48841189a8743dcd6533a9e61581e48f0f1717f1
2022-12-19 04:12:11 +00:00
Sungtak Lee
34254e5436 bufferpool2: Support mainline s/w codec
Bug: 254050250
Change-Id: Id602b1a84880546ee726f36c247fabd2e4f2127c
2022-12-19 04:11:31 +00:00
Bob Badour
0468ee6201 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  media/bufferpool/aidl/Android.bp
  media/c2/aidl/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: Icfbfae758bef55aa82873350a9e119833bacbafb
2022-12-15 07:20:02 -08:00
Treehugger Robot
94a68d04b7 Merge changes from topic "c2aidl"
* changes:
  Add Codec2 AIDL interface
  Add bufferpool AIDL definitions
2022-12-14 20:24:14 +00:00
Sungtak Lee
456c1b9602 Merge "bufferpool2: add sync() method and etc" 2022-12-09 05:26:04 +00:00
Sungtak Lee
185e03c308 Add OWNERS for media interface am: 3ee79d5a46 am: c303e7aefb am: 8860ed12ee
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2333742

Change-Id: I088a80e72e794bc0e29277701d8d0a6eeb4ed6aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 00:27:35 +00:00
Sungtak Lee
3ee79d5a46 Add OWNERS for media interface
Bug: 261752425
Change-Id: I4fe9ddd1c22ebfff03f5660ec9b01de2521f8533
2022-12-08 23:19:03 +00:00
Sungtak Lee
3782c69e1f bufferpool2: add sync() method and etc
Add sync() method to IConnection interface.
Add existing connection flag to return parcelable of
IClientManager::registerSender().
Use plain integer for returning fetch result status.

Bug: 254050250
Change-Id: Ifebd4b16e9b8c37e074e7126f39264a18fed5de8
2022-12-08 22:28:45 +00:00
Bob Badour
95a366dafb [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  media/c2/aidl/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I5b515357122fc261c6e44e155eb03e9e07780393
2022-12-08 06:18:33 -08:00
Sungtak Lee
8602fe3a0b Add Codec2 AIDL interface
Bug: 251850069
Test: m
Change-Id: I1fc28084519281df68bca7ae5e2b814b03214577
Merged-In: I1fc28084519281df68bca7ae5e2b814b03214577
2022-12-07 07:24:42 +00:00
Sungtak Lee
1468ddfbf3 Add bufferpool AIDL definitions
Bug: 254050250
Test: m
Change-Id: I4b371ccd9a1e1ed59e642d585aa4119c775fbd2c
Merged-In: I4b371ccd9a1e1ed59e642d585aa4119c775fbd2c
2022-12-07 07:23:32 +00:00
Wonsik Kim
4f5dd1c953 Mark media.bufferpool2 and media.c2 as double-loadable
LL-NDK(libmediandk) has the dependency on
"android.hardware.media.bufferpool2" and "android.hardware.media.c2".

Dependencies:
libmediandk -> libstagefright -> libsfplugin_ccodec
-> android.hardware.media.c2-V1-ndk
libmediandk -> libstagefright -> libsfplugin_ccodec
-> libcodec2_client -> libstagefright_bufferpool@
-> android.hardware.media.bufferpool2-V1-ndk

Bug: 251850069
Test: builds
Change-Id: I89aa17b8f1db9393d506edd9f242112cd11a05ec
2022-12-06 12:35:07 -08:00
Sungtak Lee
d8631076ec Merge "Add Codec2 AIDL interface" 2022-11-18 23:52:41 +00:00
Sungtak Lee
45b06598bd Add Codec2 AIDL interface
Bug: 251850069
Test: m
Change-Id: I1fc28084519281df68bca7ae5e2b814b03214577
2022-11-17 23:21:07 +00:00
Bob Badour
18c8b0edd0 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  media/bufferpool/aidl/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I65c292fd4b24f7f2a3087c48152d300b249df5ba
2022-11-10 11:40:27 -08:00
Sungtak Lee
90584d2caa Add bufferpool AIDL definitions
Bug: 254050250
Test: m
Change-Id: I4b371ccd9a1e1ed59e642d585aa4119c775fbd2c
2022-11-02 21:27:45 +00:00
Arun Johnson
03fba7a807 Allowing OMX.google* codecs for Devices launching with S
S AOSP did not remove the OMX.google* codecs, so this cannot be
enforced for devices launching with S

bug: 230582620
Change-Id: I25e8f827645db8e83c8c3142f5e76a912fdf7b22
(cherry picked from commit 6973e79b91)
Merged-In: I25e8f827645db8e83c8c3142f5e76a912fdf7b22
2022-06-29 00:03:48 +00:00
Arun Johnson
6973e79b91 Allowing OMX.google* codecs for Devices launching with S
S AOSP did not remove the OMX.google* codecs, so this cannot be
enforced for devices launching with S

bug: 230582620
Change-Id: I25e8f827645db8e83c8c3142f5e76a912fdf7b22
2022-06-27 16:19:58 +00:00
Guanwei Chen
e644bb509e fix first_api_level property fail in VF projects
Should use "ro.board.first_api_level" for vendor freeze project

Bug: 228778569
Test: run cts VtsHalMediaOmxV1_0TargetStoreTest pass

Change-Id: Ib46206be6267a44aaa0a8235a4f017569bb4de94
(cherry picked from commit a8c914ae69)
Merged-In: Ib46206be6267a44aaa0a8235a4f017569bb4de94
2022-04-29 18:04:42 +00:00
Treehugger Robot
d72ab13b5a Merge "VTS: Remove enforce codec2 on ATV for S devices" am: 842e6219c2 am: a5b65bd284 am: abce6a2ed1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2054806

Change-Id: I2c0061e94b5b60727a776ba64b653b123daff2f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 03:53:49 +00:00
Derek Smith
0877d4aa17 VTS: Remove enforce codec2 on ATV for S devices
Allow ATV devices to pass codec2 check if launched
with Android S or earlier. Codec2 support is only
mandatory for Android T on Android TV.

Bug: 226932158
Test: atest StoreHidlTest

Signed-off-by: Derek Smith <dpsmith@google.com>
Change-Id: I67a855108191da96810ea23c821d8a80752862e7
2022-04-06 21:18:35 +00:00
Treehugger Robot
5974f5869b Merge "OMX VTS: Added a test to mandate transition to C2 codecs" am: d9aa226a60 am: fe02196fac am: 3d4ad82586
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1973542

Change-Id: I581bd17ba3d44cad98ed1a8c09e1b8697d22de2b
2022-03-01 01:28:54 +00:00
Treehugger Robot
d9aa226a60 Merge "OMX VTS: Added a test to mandate transition to C2 codecs" 2022-03-01 00:20:47 +00:00
Chih-hung Hsieh
34593d4e2a Merge "Add timed out test files to tidy_timeout_srcs" am: ff54f73b4f am: fa83970b3a am: 581616e658
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1992232

Change-Id: I2eac13fe3b5ab0b4f15d6ceadf376e5e74124a81
2022-02-24 01:32:09 +00:00
Chih-Hung Hsieh
ad1bf31b78 Add timed out test files to tidy_timeout_srcs
* Timed out runs do not show any warning messages.
* These test files cannot finish clang-tidy runs with
  the following settings:
    TIDY_TIMEOUT=90
    WITH_TIDY=1
    CLANG_ANALYZER_CHECKS=1
* When TIDY_TIMEOUT is set, in Android continuous builds,
  tidy_timeout_srcs files will not be compiled by clang-tidy.
  When developers build locally without TIDY_TIMEOUT,
  tidy_timeout_srcs files will be compiled.
* Some of these test modules may be split into smaller ones,
  or disable some time consuming checks, and then
  enable clang-tidy to run within limited time.

Bug: 201099167
Test: make droid tidy-hardware-interfaces_subset
Change-Id: I1de28f1572fff368f67eab512fffec9f2e5c2a9b
2022-02-18 17:25:41 -08:00
Chih-hung Hsieh
41be2d8fa5 Merge "Fix cert-dcl16-c warnings" am: 2d028894c7 am: 2f22222a1c am: e18edd3ffd am: 3a8019b93a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1978297

Change-Id: I17838676d19fa572050bd7372bddd65eb405fa8a
2022-02-10 19:33:44 +00:00
Chih-Hung Hsieh
4f4d365aa5 Fix cert-dcl16-c warnings
Bug: 120614316
Test: make tidy-hardware-interfaces_subset
Change-Id: I6bbeddb9990e4771155ec7d49a68f0e161789030
2022-02-09 15:38:45 -08:00
Harish Mahendrakar
9f3b352cdb OMX VTS: Added a test to mandate transition to C2 codecs
- For devices launching with S and above, only audio codecs are
  allowed to use OMX.
- For devices launching with T and above, no codecs are allowed
  to use OMX.

Bug: 217793552
Test: atest VtsHalMediaOmxV1_0TargetStoreTest

Change-Id: Iff5e0c45dd7e61be9118bdcec1b6d35db3d39b4e
2022-02-04 17:03:51 -08:00
Ray Essick
be6963a279 Add explicit apex_available clauses
So we can start deleting the lists embedded in the build tools

Bug: 215589022
Test: build
Change-Id: Ibea376e172d4def6d1dbb2b8e7a170afc356f59e
2022-01-26 09:50:04 -08:00
Treehugger Robot
36c21cc8d6 Merge "Update OWNERS for VtsHalMediaOmx* tests." am: f75c21743d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1870880

Change-Id: I913de14386d08edee91197f7218a05547f405538
2021-12-03 23:43:38 +00:00
Yiming Pan
f2dfad22c3 Update OWNERS for VtsHalMediaOmx* tests.
The following tests will be affected:

VtsHalMediaOmxV1_0TargetAudioDecTest
VtsHalMediaOmxV1_0TargetAudioEncTest
VtsHalMediaOmxV1_0TargetComponentTest
VtsHalMediaOmxV1_0TargetStoreTest
VtsHalMediaOmxV1_0TargetVideoDecTest
VtsHalMediaOmxV1_0TargetVideoEncTest

Test: Tree Hugger
Bug: 143903671
Change-Id: Ide35f0bae3d39c1b328ef3b11ed73052d910d3c5
2021-10-26 16:29:00 -07:00
Lajos Molnar
7f8fb92524 omx: validate only standard OMX roles
Test uses ::android::GetComponentRole to get OMX role for media type
that only supports standard types (on GSI where VTS is run).

Bug: 164550113
Bug: 171536493
Bug: 194827876
Test: atest VtsHalMediaOmxV1_0TargetStoreTest
Change-Id: Ia9e64c8d887518f6c7d8c650a942bad7ce3457f0
2021-08-11 17:10:38 +00:00
Bob Badour
304e9ea675 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  automotive/vehicle/2.0/vts/functional/Android.bp
  media/c2/1.2/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Iffcdec8246a5acaf28ccb4475a309554f46b56ce
2021-03-25 12:22:15 -07:00
Sungtak Lee
aede9615c7 Add media.c2@1.2
Add setOutputSurfaceWithSyncObj() to IComponent.

Test: make vts -j123 && vts-tradefed run commandAndExit vts \
-m VtsHAlMediaC2V1_0Host

Bug: 157111613
Change-Id: I5a52b3d9448ea88681eb9b1b409f89723f732e9b
2021-03-22 15:59:46 -07:00
Bob Badour
c22b35bf04 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  atrace/1.0/Android.bp
  atrace/1.0/default/Android.bp
  atrace/1.0/vts/functional/Android.bp
  audio/2.0/Android.bp
  audio/2.0/config/Android.bp
  audio/4.0/Android.bp
  audio/4.0/config/Android.bp
  audio/5.0/Android.bp
  audio/5.0/config/Android.bp
  audio/6.0/Android.bp
  audio/6.0/config/Android.bp
  audio/7.0/Android.bp
  audio/7.0/config/Android.bp
  audio/common/2.0/Android.bp
  audio/common/4.0/Android.bp
  audio/common/5.0/Android.bp
  audio/common/6.0/Android.bp
  audio/common/7.0/Android.bp
  audio/common/7.0/example/Android.bp
  audio/common/all-versions/default/Android.bp
  audio/common/all-versions/default/service/Android.bp
  audio/common/all-versions/test/utility/Android.bp
  audio/common/all-versions/util/Android.bp
  audio/core/all-versions/default/Android.bp
  audio/core/all-versions/default/util/Android.bp
  audio/core/all-versions/vts/functional/Android.bp
  audio/effect/2.0/Android.bp
  audio/effect/2.0/xml/Android.bp
  audio/effect/4.0/Android.bp
  audio/effect/4.0/xml/Android.bp
  audio/effect/5.0/Android.bp
  audio/effect/5.0/xml/Android.bp
  audio/effect/6.0/Android.bp
  audio/effect/6.0/xml/Android.bp
  audio/effect/7.0/Android.bp
  audio/effect/7.0/xml/Android.bp
  audio/effect/all-versions/default/Android.bp
  audio/effect/all-versions/default/util/Android.bp
  audio/effect/all-versions/vts/functional/Android.bp
  audio/policy/1.0/vts/functional/Android.bp
  audio/policy/1.0/xml/Android.bp
  audio/policy/1.0/xml/pfw_schemas/Android.bp
  authsecret/1.0/Android.bp
  authsecret/1.0/default/Android.bp
  authsecret/1.0/vts/functional/Android.bp
  authsecret/aidl/Android.bp
  authsecret/aidl/default/Android.bp
  authsecret/aidl/vts/Android.bp
  automotive/audiocontrol/1.0/Android.bp
  automotive/audiocontrol/1.0/default/Android.bp
  automotive/audiocontrol/1.0/vts/functional/Android.bp
  automotive/audiocontrol/2.0/Android.bp
  automotive/audiocontrol/2.0/default/Android.bp
  automotive/audiocontrol/2.0/vts/functional/Android.bp
  automotive/audiocontrol/aidl/Android.bp
  automotive/audiocontrol/aidl/default/Android.bp
  automotive/audiocontrol/aidl/vts/Android.bp
  automotive/can/1.0/default/libnetdevice/Android.bp
  automotive/can/1.0/default/libnl++/Android.bp
  automotive/can/1.0/hidl-utils/Android.bp
  automotive/can/1.0/tools/Android.bp
  automotive/can/1.0/tools/configurator/Android.bp
  automotive/can/1.0/tools/configurator/proto/Android.bp
  automotive/can/1.0/tools/libcanhaltools/Android.bp
  automotive/can/1.0/vts/functional/Android.bp
  automotive/can/1.0/vts/utils/Android.bp
  automotive/evs/1.0/Android.bp
  automotive/evs/1.0/default/Android.bp
  automotive/evs/1.0/vts/functional/Android.bp
  automotive/evs/1.1/Android.bp
  automotive/evs/1.1/default/Android.bp
  automotive/evs/1.1/vts/functional/Android.bp
  automotive/evs/1.1/vts/fuzzing/Android.bp
  automotive/evs/common/utils/default/Android.bp
  automotive/evs/common/utils/default/test/fuzz/Android.bp
  automotive/occupant_awareness/aidl/Android.bp
  automotive/occupant_awareness/aidl/default/Android.bp
  automotive/occupant_awareness/aidl/mock/Android.bp
  automotive/occupant_awareness/aidl/vts/functional/Android.bp
  automotive/sv/1.0/Android.bp
  automotive/sv/1.0/default/Android.bp
  automotive/sv/1.0/vts/functional/Android.bp
  automotive/vehicle/2.0/Android.bp
  automotive/vehicle/2.0/default/Android.bp
  automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/Android.bp
  automotive/vehicle/2.0/utils/Android.bp
  biometrics/common/aidl/Android.bp
  biometrics/face/1.0/Android.bp
  biometrics/face/1.0/default/Android.bp
  biometrics/face/1.0/vts/functional/Android.bp
  biometrics/face/aidl/Android.bp
  biometrics/face/aidl/default/Android.bp
  biometrics/face/aidl/vts/Android.bp
  biometrics/fingerprint/2.1/Android.bp
  biometrics/fingerprint/2.1/default/Android.bp
  biometrics/fingerprint/2.1/vts/functional/Android.bp
  biometrics/fingerprint/2.2/Android.bp
  biometrics/fingerprint/2.2/default/Android.bp
  biometrics/fingerprint/2.2/vts/functional/Android.bp
  biometrics/fingerprint/2.3/Android.bp
  biometrics/fingerprint/2.3/vts/functional/Android.bp
  biometrics/fingerprint/aidl/Android.bp
  biometrics/fingerprint/aidl/default/Android.bp
  biometrics/fingerprint/aidl/vts/Android.bp
  bluetooth/1.0/Android.bp
  bluetooth/1.0/default/Android.bp
  bluetooth/1.0/vts/functional/Android.bp
  bluetooth/1.1/Android.bp
  bluetooth/1.1/default/Android.bp
  bluetooth/1.1/vts/functional/Android.bp
  bluetooth/a2dp/1.0/Android.bp
  bluetooth/a2dp/1.0/default/Android.bp
  bluetooth/a2dp/1.0/vts/functional/Android.bp
  bluetooth/audio/2.0/Android.bp
  bluetooth/audio/2.0/default/Android.bp
  bluetooth/audio/2.0/vts/functional/Android.bp
  bluetooth/audio/2.1/Android.bp
  bluetooth/audio/2.1/default/Android.bp
  bluetooth/audio/2.1/vts/functional/Android.bp
  bluetooth/audio/utils/Android.bp
  boot/1.0/Android.bp
  boot/1.0/default/Android.bp
  boot/1.0/vts/functional/Android.bp
  boot/1.1/Android.bp
  boot/1.1/default/Android.bp
  boot/1.1/default/boot_control/Android.bp
  boot/1.1/vts/functional/Android.bp
  boot/1.2/Android.bp
  boot/1.2/default/Android.bp
  boot/1.2/vts/functional/Android.bp
  broadcastradio/1.0/Android.bp
  broadcastradio/1.0/default/Android.bp
  broadcastradio/1.0/vts/functional/Android.bp
  broadcastradio/1.1/Android.bp
  broadcastradio/1.1/default/Android.bp
  broadcastradio/1.1/vts/functional/Android.bp
  broadcastradio/2.0/Android.bp
  broadcastradio/2.0/default/Android.bp
  broadcastradio/2.0/vts/functional/Android.bp
  broadcastradio/common/tests/Android.bp
  broadcastradio/common/utils/Android.bp
  broadcastradio/common/utils1x/Android.bp
  broadcastradio/common/utils2x/Android.bp
  broadcastradio/common/vts/utils/Android.bp
  camera/common/1.0/Android.bp
  camera/common/1.0/default/Android.bp
  camera/device/1.0/Android.bp
  camera/device/1.0/default/Android.bp
  camera/device/3.2/Android.bp
  camera/device/3.2/default/Android.bp
  camera/device/3.3/Android.bp
  camera/device/3.3/default/Android.bp
  camera/device/3.4/Android.bp
  camera/device/3.4/default/Android.bp
  camera/device/3.5/Android.bp
  camera/device/3.5/default/Android.bp
  camera/device/3.6/Android.bp
  camera/device/3.6/default/Android.bp
  camera/metadata/3.2/Android.bp
  camera/metadata/3.3/Android.bp
  camera/metadata/3.4/Android.bp
  camera/metadata/3.5/Android.bp
  camera/metadata/3.6/Android.bp
  camera/provider/2.4/Android.bp
  camera/provider/2.4/default/Android.bp
  camera/provider/2.4/vts/functional/Android.bp
  camera/provider/2.5/Android.bp
  camera/provider/2.5/default/Android.bp
  camera/provider/2.6/Android.bp
  cas/1.0/Android.bp
  cas/1.0/default/Android.bp
  cas/1.0/vts/functional/Android.bp
  cas/1.1/Android.bp
  cas/1.1/default/Android.bp
  cas/1.1/vts/functional/Android.bp
  cas/1.2/Android.bp
  cas/1.2/default/Android.bp
  cas/1.2/vts/functional/Android.bp
  cas/native/1.0/Android.bp
  common/aidl/Android.bp
  common/fmq/aidl/Android.bp
  common/support/Android.bp
  compatibility_matrices/Android.bp
  compatibility_matrices/Android.mk
  compatibility_matrices/build/Android.bp
  compatibility_matrices/exclude/Android.bp
  configstore/1.0/Android.bp
  configstore/1.0/vts/functional/Android.bp
  configstore/1.1/Android.bp
  configstore/1.1/default/Android.mk
  configstore/utils/Android.bp
  confirmationui/1.0/Android.bp
  confirmationui/1.0/default/Android.bp
  confirmationui/1.0/vts/functional/Android.bp
  confirmationui/support/Android.bp
  contexthub/1.0/Android.bp
  contexthub/1.0/default/Android.bp
  contexthub/1.0/vts/functional/Android.bp
  contexthub/1.1/Android.bp
  contexthub/1.1/default/Android.bp
  contexthub/1.1/vts/functional/Android.bp
  contexthub/1.2/Android.bp
  contexthub/1.2/default/Android.bp
  contexthub/1.2/vts/functional/Android.bp
  contexthub/common/default/1.X/Android.bp
  contexthub/common/default/1.X/utils/Android.bp
  contexthub/common/vts/Android.bp
  drm/1.0/Android.bp
  drm/1.0/default/Android.bp
  drm/1.0/vts/functional/Android.bp
  drm/1.1/Android.bp
  drm/1.1/vts/functional/Android.bp
  drm/1.2/Android.bp
  drm/1.2/vts/functional/Android.bp
  drm/1.3/Android.bp
  drm/1.3/vts/functional/Android.bp
  drm/1.4/Android.bp
  drm/1.4/vts/functional/Android.bp
  dumpstate/1.0/Android.bp
  dumpstate/1.0/default/Android.bp
  dumpstate/1.0/vts/functional/Android.bp
  dumpstate/1.1/Android.bp
  dumpstate/1.1/default/Android.bp
  dumpstate/1.1/vts/functional/Android.bp
  fastboot/1.0/Android.bp
  fastboot/1.0/default/Android.bp
  fastboot/1.1/Android.bp
  fastboot/1.1/default/Android.bp
  gatekeeper/1.0/Android.bp
  gatekeeper/1.0/default/Android.bp
  gatekeeper/1.0/software/Android.bp
  gatekeeper/1.0/software/tests/Android.bp
  gatekeeper/1.0/vts/functional/Android.bp
  gnss/1.0/Android.bp
  gnss/1.0/default/Android.bp
  gnss/1.0/vts/functional/Android.bp
  gnss/1.1/Android.bp
  gnss/1.1/default/Android.bp
  gnss/1.1/vts/functional/Android.bp
  gnss/2.0/Android.bp
  gnss/2.0/default/Android.bp
  gnss/2.0/vts/functional/Android.bp
  gnss/2.1/Android.bp
  gnss/2.1/default/Android.bp
  gnss/2.1/vts/functional/Android.bp
  gnss/aidl/Android.bp
  gnss/aidl/default/Android.bp
  gnss/aidl/vts/Android.bp
  gnss/common/utils/default/Android.bp
  gnss/common/utils/vts/Android.bp
  gnss/measurement_corrections/1.0/Android.bp
  gnss/measurement_corrections/1.1/Android.bp
  gnss/visibility_control/1.0/Android.bp
  graphics/allocator/2.0/Android.bp
  graphics/allocator/2.0/default/Android.bp
  graphics/allocator/2.0/utils/gralloc1-adapter/Android.bp
  graphics/allocator/2.0/utils/hal/Android.bp
  graphics/allocator/2.0/utils/passthrough/Android.bp
  graphics/allocator/3.0/Android.bp
  graphics/allocator/4.0/Android.bp
  graphics/bufferqueue/1.0/Android.bp
  graphics/bufferqueue/2.0/Android.bp
  graphics/common/1.0/Android.bp
  graphics/common/1.1/Android.bp
  graphics/common/1.2/Android.bp
  graphics/common/aidl/Android.bp
  graphics/composer/2.1/Android.bp
  graphics/composer/2.1/default/Android.bp
  graphics/composer/2.1/utils/command-buffer/Android.bp
  graphics/composer/2.1/utils/hal/Android.bp
  graphics/composer/2.1/utils/hwc2on1adapter/Android.bp
  graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp
  graphics/composer/2.1/utils/passthrough/Android.bp
  graphics/composer/2.1/utils/resources/Android.bp
  graphics/composer/2.1/utils/vts/Android.bp
  graphics/composer/2.1/vts/functional/Android.bp
  graphics/composer/2.2/Android.bp
  graphics/composer/2.2/default/Android.mk
  graphics/composer/2.2/utils/command-buffer/Android.bp
  graphics/composer/2.2/utils/hal/Android.bp
  graphics/composer/2.2/utils/passthrough/Android.bp
  graphics/composer/2.2/utils/resources/Android.bp
  graphics/composer/2.2/utils/vts/Android.bp
  graphics/composer/2.2/vts/functional/Android.bp
  graphics/composer/2.3/Android.bp
  graphics/composer/2.3/default/Android.bp
  graphics/composer/2.3/utils/command-buffer/Android.bp
  graphics/composer/2.3/utils/hal/Android.bp
  graphics/composer/2.3/utils/passthrough/Android.bp
  graphics/composer/2.3/utils/vts/Android.bp
  graphics/composer/2.3/vts/functional/Android.bp
  graphics/composer/2.4/Android.bp
  graphics/composer/2.4/default/Android.bp
  graphics/composer/2.4/utils/command-buffer/Android.bp
  graphics/composer/2.4/utils/hal/Android.bp
  graphics/composer/2.4/utils/passthrough/Android.bp
  graphics/composer/2.4/utils/vts/Android.bp
  graphics/composer/2.4/vts/functional/Android.bp
  graphics/mapper/2.0/Android.bp
  graphics/mapper/2.0/default/Android.bp
  graphics/mapper/2.0/utils/hal/Android.bp
  graphics/mapper/2.0/utils/passthrough/Android.bp
  graphics/mapper/2.0/utils/vts/Android.bp
  graphics/mapper/2.0/vts/functional/Android.bp
  graphics/mapper/2.1/Android.bp
  graphics/mapper/2.1/default/Android.bp
  graphics/mapper/2.1/utils/hal/Android.bp
  graphics/mapper/2.1/utils/passthrough/Android.bp
  graphics/mapper/2.1/utils/vts/Android.bp
  graphics/mapper/2.1/vts/functional/Android.bp
  graphics/mapper/3.0/Android.bp
  graphics/mapper/3.0/utils/vts/Android.bp
  graphics/mapper/3.0/vts/functional/Android.bp
  graphics/mapper/4.0/Android.bp
  graphics/mapper/4.0/utils/vts/Android.bp
  graphics/mapper/4.0/vts/functional/Android.bp
  health/1.0/Android.bp
  health/1.0/default/Android.bp
  health/2.0/Android.bp
  health/2.0/default/Android.bp
  health/2.0/utils/libhealthhalutils/Android.bp
  health/2.0/utils/libhealthservice/Android.bp
  health/2.0/utils/libhealthstoragedefault/Android.bp
  health/2.0/vts/functional/Android.bp
  health/2.1/Android.bp
  health/2.1/default/Android.bp
  health/2.1/vts/functional/Android.bp
  health/storage/1.0/Android.bp
  health/storage/1.0/default/Android.bp
  health/storage/1.0/vts/functional/Android.bp
  health/storage/aidl/Android.bp
  health/storage/aidl/default/Android.bp
  health/storage/aidl/vts/functional/Android.bp
  health/storage/impl_common/Android.bp
  health/storage/test_common/Android.bp
  health/utils/libhealth2impl/Android.bp
  health/utils/libhealthloop/Android.bp
  identity/aidl/Android.bp
  identity/aidl/default/Android.bp
  identity/aidl/vts/Android.bp
  identity/support/Android.bp
  input/classifier/1.0/Android.bp
  input/classifier/1.0/default/Android.bp
  input/classifier/1.0/vts/functional/Android.bp
  input/common/1.0/Android.bp
  ir/1.0/Android.bp
  ir/1.0/default/Android.bp
  ir/1.0/vts/functional/Android.bp
  keymaster/3.0/Android.bp
  keymaster/3.0/default/Android.mk
  keymaster/3.0/vts/functional/Android.bp
  keymaster/4.0/Android.bp
  keymaster/4.0/default/Android.bp
  keymaster/4.0/support/Android.bp
  keymaster/4.0/vts/functional/Android.bp
  keymaster/4.0/vts/performance/Android.bp
  keymaster/4.1/Android.bp
  keymaster/4.1/default/Android.bp
  keymaster/4.1/support/Android.bp
  keymaster/4.1/vts/functional/Android.bp
  keymaster/aidl/Android.bp
  light/2.0/Android.bp
  light/2.0/default/Android.bp
  light/2.0/vts/functional/Android.bp
  light/aidl/Android.bp
  light/aidl/default/Android.bp
  light/aidl/vts/functional/Android.bp
  light/utils/Android.bp
  media/1.0/Android.bp
  media/1.0/xml/Android.mk
  media/Android.bp
  media/bufferpool/1.0/Android.bp
  media/bufferpool/2.0/Android.bp
  media/c2/1.0/Android.bp
  media/c2/1.1/Android.bp
  media/omx/1.0/Android.bp
  media/omx/1.0/vts/functional/audio/Android.bp
  media/omx/1.0/vts/functional/common/Android.bp
  media/omx/1.0/vts/functional/component/Android.bp
  media/omx/1.0/vts/functional/store/Android.bp
  media/omx/1.0/vts/functional/video/Android.bp
  memtrack/1.0/Android.bp
  memtrack/1.0/default/Android.bp
  memtrack/1.0/vts/functional/Android.bp
  memtrack/aidl/Android.bp
  memtrack/aidl/default/Android.bp
  memtrack/aidl/vts/Android.bp
  neuralnetworks/1.0/Android.bp
  neuralnetworks/1.0/utils/Android.bp
  neuralnetworks/1.0/vts/functional/Android.bp
  neuralnetworks/1.1/Android.bp
  neuralnetworks/1.1/utils/Android.bp
  neuralnetworks/1.1/vts/functional/Android.bp
  neuralnetworks/1.2/Android.bp
  neuralnetworks/1.2/utils/Android.bp
  neuralnetworks/1.2/vts/functional/Android.bp
  neuralnetworks/1.3/Android.bp
  neuralnetworks/1.3/utils/Android.bp
  neuralnetworks/1.3/vts/functional/Android.bp
  neuralnetworks/aidl/Android.bp
  neuralnetworks/aidl/utils/Android.bp
  neuralnetworks/aidl/vts/functional/Android.bp
  neuralnetworks/utils/common/Android.bp
  neuralnetworks/utils/service/Android.bp
  nfc/1.0/Android.bp
  nfc/1.0/default/Android.bp
  nfc/1.0/vts/functional/Android.bp
  nfc/1.1/Android.bp
  nfc/1.1/vts/functional/Android.bp
  nfc/1.2/Android.bp
  nfc/1.2/vts/functional/Android.bp
  oemlock/1.0/Android.bp
  oemlock/1.0/vts/functional/Android.bp
  oemlock/aidl/Android.bp
  oemlock/aidl/default/Android.bp
  oemlock/aidl/vts/Android.bp
  power/1.0/Android.bp
  power/1.0/default/Android.bp
  power/1.0/vts/functional/Android.bp
  power/1.1/Android.bp
  power/1.1/vts/functional/Android.bp
  power/1.2/Android.bp
  power/1.2/vts/functional/Android.bp
  power/1.3/Android.bp
  power/1.3/vts/functional/Android.bp
  power/aidl/Android.bp
  power/aidl/default/Android.bp
  power/aidl/vts/Android.bp
  power/stats/1.0/Android.bp
  power/stats/1.0/default/Android.bp
  power/stats/1.0/vts/functional/Android.bp
  power/stats/aidl/Android.bp
  power/stats/aidl/default/Android.bp
  power/stats/aidl/vts/Android.bp
  radio/1.0/Android.bp
  radio/1.0/vts/functional/Android.bp
  radio/1.1/Android.bp
  radio/1.1/vts/functional/Android.bp
  radio/1.2/Android.bp
  radio/1.2/default/Android.bp
  radio/1.2/vts/functional/Android.bp
  radio/1.3/Android.bp
  radio/1.3/vts/functional/Android.bp
  radio/1.4/Android.bp
  radio/1.4/vts/functional/Android.bp
  radio/1.5/Android.bp
  radio/1.5/vts/functional/Android.bp
  radio/1.6/Android.bp
  radio/1.6/vts/functional/Android.bp
  radio/config/1.0/Android.bp
  radio/config/1.0/default/Android.bp
  radio/config/1.0/vts/functional/Android.bp
  radio/config/1.1/Android.bp
  radio/config/1.1/vts/functional/Android.bp
  radio/config/1.2/Android.bp
  radio/config/1.2/vts/functional/Android.bp
  radio/config/1.3/Android.bp
  radio/config/1.3/vts/functional/Android.bp
  radio/deprecated/1.0/Android.bp
  rebootescrow/aidl/Android.bp
  rebootescrow/aidl/default/Android.bp
  rebootescrow/aidl/vts/functional/Android.bp
  renderscript/1.0/Android.bp
  renderscript/1.0/default/Android.bp
  renderscript/1.0/vts/functional/Android.bp
  secure_element/1.0/Android.bp
  secure_element/1.0/vts/functional/Android.bp
  secure_element/1.1/Android.bp
  secure_element/1.1/vts/functional/Android.bp
  secure_element/1.2/Android.bp
  secure_element/1.2/vts/functional/Android.bp
  security/keymint/aidl/Android.bp
  security/keymint/aidl/default/Android.bp
  security/keymint/aidl/vts/functional/Android.bp
  security/keymint/aidl/vts/performance/Android.bp
  security/keymint/support/Android.bp
  security/secureclock/aidl/Android.bp
  security/secureclock/aidl/vts/functional/Android.bp
  security/sharedsecret/aidl/Android.bp
  security/sharedsecret/aidl/vts/functional/Android.bp
  sensors/1.0/Android.bp
  sensors/1.0/default/Android.bp
  sensors/1.0/vts/functional/Android.bp
  sensors/2.0/Android.bp
  sensors/2.0/default/Android.bp
  sensors/2.0/multihal/Android.bp
  sensors/2.0/vts/functional/Android.bp
  sensors/2.1/Android.bp
  sensors/2.1/default/Android.bp
  sensors/2.1/multihal/Android.bp
  sensors/2.1/vts/functional/Android.bp
  sensors/common/default/2.X/Android.bp
  sensors/common/default/2.X/multihal/Android.bp
  sensors/common/default/2.X/multihal/tests/Android.bp
  sensors/common/utils/Android.bp
  sensors/common/vts/2_X/Android.bp
  sensors/common/vts/utils/Android.bp
  soundtrigger/2.0/Android.bp
  soundtrigger/2.0/default/Android.bp
  soundtrigger/2.0/default/Android.mk
  soundtrigger/2.0/vts/functional/Android.bp
  soundtrigger/2.1/Android.bp
  soundtrigger/2.1/default/Android.mk
  soundtrigger/2.1/vts/functional/Android.bp
  soundtrigger/2.2/Android.bp
  soundtrigger/2.2/default/Android.bp
  soundtrigger/2.2/vts/functional/Android.bp
  soundtrigger/2.3/Android.bp
  soundtrigger/2.3/default/Android.bp
  soundtrigger/2.3/vts/functional/Android.bp
  tests/bar/1.0/Android.bp
  tests/bar/1.0/default/Android.bp
  tests/baz/1.0/Android.bp
  tests/baz/1.0/default/Android.bp
  tests/expression/1.0/Android.bp
  tests/extension/light/2.0/Android.bp
  tests/extension/light/2.0/default/Android.bp
  tests/extension/vibrator/aidl/Android.bp
  tests/extension/vibrator/aidl/client/Android.bp
  tests/extension/vibrator/aidl/default/Android.bp
  tests/foo/1.0/Android.bp
  tests/foo/1.0/default/Android.bp
  tests/foo/1.0/default/lib/Android.bp
  tests/hash/1.0/Android.bp
  tests/hash/1.0/default/Android.bp
  tests/inheritance/1.0/Android.bp
  tests/inheritance/1.0/default/Android.bp
  tests/lazy/1.0/Android.bp
  tests/lazy/1.1/Android.bp
  tests/libhwbinder/1.0/Android.bp
  tests/libhwbinder/1.0/default/Android.bp
  tests/libhwbinder/aidl/Android.bp
  tests/memory/1.0/Android.bp
  tests/memory/1.0/default/Android.bp
  tests/memory/2.0/Android.bp
  tests/msgq/1.0/Android.bp
  tests/msgq/1.0/default/Android.bp
  tests/multithread/1.0/Android.bp
  tests/multithread/1.0/default/Android.bp
  tests/safeunion/1.0/Android.bp
  tests/safeunion/1.0/default/Android.bp
  tests/safeunion/cpp/1.0/Android.bp
  tests/safeunion/cpp/1.0/default/Android.bp
  tests/trie/1.0/Android.bp
  tests/trie/1.0/default/Android.bp
  tetheroffload/config/1.0/Android.bp
  tetheroffload/config/1.0/vts/functional/Android.bp
  tetheroffload/control/1.0/Android.bp
  tetheroffload/control/1.0/vts/functional/Android.bp
  tetheroffload/control/1.1/Android.bp
  tetheroffload/control/1.1/vts/functional/Android.bp
  thermal/1.0/Android.bp
  thermal/1.0/default/Android.bp
  thermal/1.0/vts/functional/Android.bp
  thermal/1.1/Android.bp
  thermal/1.1/vts/functional/Android.bp
  thermal/2.0/Android.bp
  thermal/2.0/default/Android.bp
  thermal/2.0/vts/functional/Android.bp
  tv/cec/1.0/Android.bp
  tv/cec/1.0/default/Android.bp
  tv/cec/1.1/Android.bp
  tv/cec/1.1/default/Android.bp
  tv/cec/1.1/vts/functional/Android.bp
  tv/input/1.0/Android.bp
  tv/input/1.0/default/Android.bp
  tv/input/1.0/vts/functional/Android.bp
  tv/tuner/1.0/Android.bp
  tv/tuner/1.0/default/Android.bp
  tv/tuner/1.0/vts/functional/Android.bp
  tv/tuner/1.1/Android.bp
  tv/tuner/1.1/default/Android.bp
  tv/tuner/1.1/vts/functional/Android.bp
  tv/tuner/assets/Android.bp
  usb/1.0/Android.bp
  usb/1.0/default/Android.bp
  usb/1.0/vts/functional/Android.bp
  usb/1.1/Android.bp
  usb/1.1/vts/functional/Android.bp
  usb/1.2/Android.bp
  usb/1.2/vts/functional/Android.bp
  usb/1.3/Android.bp
  usb/1.3/vts/functional/Android.bp
  usb/gadget/1.0/Android.bp
  usb/gadget/1.1/Android.bp
  usb/gadget/1.1/default/Android.bp
  usb/gadget/1.1/default/lib/Android.bp
  usb/gadget/1.2/Android.bp
  usb/gadget/1.2/default/Android.bp
  usb/gadget/1.2/default/lib/Android.bp
  vibrator/1.0/Android.bp
  vibrator/1.0/default/Android.bp
  vibrator/1.0/vts/functional/Android.bp
  vibrator/1.1/Android.bp
  vibrator/1.1/vts/functional/Android.bp
  vibrator/1.2/Android.bp
  vibrator/1.2/vts/functional/Android.bp
  vibrator/1.3/Android.bp
  vibrator/1.3/example/Android.bp
  vibrator/1.3/vts/functional/Android.bp
  vibrator/aidl/Android.bp
  vibrator/aidl/default/Android.bp
  vibrator/aidl/vts/Android.bp
  vibrator/bench/Android.bp
  vr/1.0/Android.bp
  vr/1.0/default/Android.bp
  vr/1.0/vts/functional/Android.bp
  weaver/1.0/Android.bp
  weaver/1.0/vts/functional/Android.bp
  weaver/aidl/Android.bp
  weaver/aidl/default/Android.bp
  weaver/aidl/vts/Android.bp
  wifi/1.0/Android.bp
  wifi/1.0/vts/functional/Android.bp
  wifi/1.1/Android.bp
  wifi/1.1/vts/functional/Android.bp
  wifi/1.2/Android.bp
  wifi/1.2/vts/functional/Android.bp
  wifi/1.3/Android.bp
  wifi/1.3/vts/functional/Android.bp
  wifi/1.4/Android.bp
  wifi/1.4/vts/functional/Android.bp
  wifi/1.5/Android.bp
  wifi/1.5/default/Android.mk
  wifi/1.5/vts/functional/Android.bp
  wifi/hostapd/1.0/Android.bp
  wifi/hostapd/1.0/vts/functional/Android.bp
  wifi/hostapd/1.1/Android.bp
  wifi/hostapd/1.1/vts/functional/Android.bp
  wifi/hostapd/1.2/Android.bp
  wifi/hostapd/1.2/vts/functional/Android.bp
  wifi/hostapd/1.3/Android.bp
  wifi/hostapd/1.3/vts/functional/Android.bp
  wifi/offload/1.0/Android.bp
  wifi/offload/1.0/vts/functional/Android.bp
  wifi/supplicant/1.0/Android.bp
  wifi/supplicant/1.0/vts/functional/Android.bp
  wifi/supplicant/1.1/Android.bp
  wifi/supplicant/1.1/vts/functional/Android.bp
  wifi/supplicant/1.2/Android.bp
  wifi/supplicant/1.2/vts/functional/Android.bp
  wifi/supplicant/1.3/Android.bp
  wifi/supplicant/1.3/vts/functional/Android.bp
  wifi/supplicant/1.4/Android.bp
  wifi/supplicant/1.4/vts/functional/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-NCSA to:
  Android.bp
  automotive/can/1.0/Android.bp
  automotive/can/1.0/default/Android.bp

Added SPDX-license-identifier-NCSA to:
  automotive/can/1.0/default/libc++fs/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: If5e9ac8023cdc10d2370d16e7dd75a4bbb7085aa
2021-02-23 14:26:20 -08:00
Ram Mohan
179a52cbbf OMX VTS: free graphics buffers at the end of test
Bug: 173454295
Test: atest VtsHalMediaOmxV1_0TargetVideoDecTest
Test: atest VtsHalMediaOmxV1_0TargetVideoEncTest
Change-Id: Ib9660ef8967b34114b36d71f9ed424f819b57e7a
2021-01-20 13:59:50 -08:00
Xin Li
50393137ed Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: I6756cad681e4cfa01868450214da0d7b2d5261e4
Change-Id: Ia529ecf4f48248d5af63673f359916486f71bc35
2020-10-08 23:22:52 -07:00
Dan Shi
ac9cf4482b Suppress gtest error for tests without any instance
Bug: 162052785
Test: m -j vts
Change-Id: I627d6790aa08aa9c6e3c5b8bdc533213ee08de21
Merged-In: I627d6790aa08aa9c6e3c5b8bdc533213ee08de21
2020-09-11 11:02:25 -07:00
Xin Li
36dcf1a404 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I6502829205ede2de914b27e6c2c5c42916af2b39
Change-Id: I7cb06511e43bd1fffd5f80a11dbdf5b1314cfe8e
2020-08-28 13:05:04 -07:00
Sungtak Lee
1d5fbadc8b [DO NOT MERGE] resolve merge conflicts of a57cde11c4 to rvc-d1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I4f79427ceeaec1b823270bbc8f2513ed28ea8f67
2020-08-05 13:51:48 -07:00
Lajos Molnar
7a3434e08e resolve merge conflicts of ae811bc806 to rvc-dev-plus-aosp
Change-Id: I555ff20739fe7e2ed195d1e670ebec5f1da4aaf0
2020-08-02 23:35:10 -07:00
Lajos Molnar
237e3d7ffc omx vts: update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Change-Id: I0ced401233497bbbfce90e9b84147bb08399e421
2020-07-31 04:35:05 +00:00
Lajos Molnar
3836d5584a omx: rename master to store
Update language to comply with Android's inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Change-Id: I9b1f8ed9da444024cd2fa2f3a62b6874dcd96cf7
2020-07-31 04:34:57 +00:00
Pawin Vongmasa
0f9e6d56dc OMX VTS: Use GetComponentRole from OMXUtils
Test: atest VtsHalMediaOmxV1_0TargetMasterTest

Bug: 159410244
Change-Id: Iba2a7259ddc5fc634b22d8c5954178dede6b71d5
Merged-In: Iba2a7259ddc5fc634b22d8c5954178dede6b71d5
2020-07-31 04:34:45 +00:00
Devin Moore
34a4184d91 Convert Python OMX VTS test to Gtest
Moving the extra tests from
test/vts-testcase/hal/media/omx/V1_0/host_omxstore/VtsHalMediaOmxStoreV1_0HostTest.py
to the OMX Gtest in VtsHalMediaOmxV1_0TargetMasterTest.

This is mostly validating the RoleInfo and NodeInfo data obtained from
IOmxStore interface.

Bug: 152237762
Test: atest VtsHalMediaOmxV1_0TargetMasterTest on cf and pixel devices
Change-Id: I8174b8953ee5e484777afb21b2d170cec0159edc
Merged-In: I8174b8953ee5e484777afb21b2d170cec0159edc
2020-07-31 04:34:06 +00:00