Leon Scroggins III
63c8fea778
VTS: Add flag dependency so librenderengine can be used
...
I6c436b6b80b27930d82aabf22107216172773b56 adds a dependency for
librenderengine on flags. Add that dependency so we can use
librenderengine here, too.
Bug: 305445199
Test: atest VtsHalGraphicsComposerV2_2TargetTest
Test: atest VtsHalGraphicsComposer3_TargetTest
Change-Id: If339ac94a6eff4af34e60cf1c1135289b8915441
2024-02-05 12:51:01 -05:00
Aditya Choudhary
85d604d0db
[DON'T BLOCK] Test ownership migration rules am: c5c6c62995
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2939799
Change-Id: I1046113ffdcd09649fa65e023aae0969262772e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-31 17:06:10 +00:00
Aditya Choudhary
c5c6c62995
[DON'T BLOCK] Test ownership migration rules
...
This CL is created as a best effort to migrate test targets
to the new android ownership model. If you find incorrect or unnecessary
attribution in this CL, please create a separate CL to fix that.
For more details please refer to the link below,
<add g3 doc link>
Bug: 304529413
Test: N/A
Change-Id: I3322344f595f974f730dc824af0110388076d838
2024-01-31 11:06:17 +00:00
Alec Mouri
75a546270a
Remove useFramebufferCache parameter in drawLayers()
...
GLESRenderEngine used it, but GLESRenderEngine is no more.
Bug: 199918329
Test: builds
Change-Id: I9c735e5820bd187f910905e7e77f9445f0ff30db
2023-08-18 15:01:52 +00:00
John Reck
631dc15b2e
Remove allocator from composer2.1-4 VTS
...
Bug: 292584923
Test: make VtsHalGraphicsComposerV2_3TargetTest VtsHalGraphicsComposerV2_4TargetTest VtsHalGraphicsComposerV2_2TargetTest VtsHalGraphicsComposerV2_1TargetTest
Change-Id: I6c5e8c8b96450f800bb60b6ed0ce3b3c10ce1565
2023-07-26 16:06:34 -04:00
John Reck
6d0abbb439
Remove mapper from composer2.1 VTS
...
Bug: 292584923
Test: make VtsHalGraphicsComposerV2_3TargetTest VtsHalGraphicsComposerV2_4TargetTest VtsHalGraphicsComposerV2_2TargetTest VtsHalGraphicsComposerV2_1TargetTest
Change-Id: I3642995e7236a3b9b08ad5419c9d02b67243b24a
2023-07-26 15:54:47 -04:00
John Reck
82c666bd8c
Remove mapper from composer2.2 VTS
...
Test: make VtsHalGraphicsComposerV2_2TargetTest
Bug: 292584923
Change-Id: Id281c732535ace4a36750d759b59db7aa6e5cb3a
2023-07-26 10:17:17 -04:00
Brian Lindahl
e887a25203
Revert "Add VTS readback tests for buffer slot clearing"
...
This reverts commit d103cd6828 .
NOTE: This is not a full revert, it leaves the production code in place and only reverts the VTS test changes.
Reason for revert: b/262370410
Test: atest VtsHalGraphicsComposerV2_1TargetTest on Oriole
Test: atest VtsHalGraphicsComposerV2_2TargetTest on Oriole
Test: atest VtsHalGraphicsComposerV2_3TargetTest on Oriole
Test: atest VtsHalGraphicsComposerV2_4TargetTest on Oriole
Bug: 262370410
Change-Id: I336beb9f0ed81b305b26c6d8e9da70cfabe04bbd
2023-01-18 21:18:21 +00:00
Nolan Scobie
8ef31a2afb
Merge "Add librenderengine_deps to targets depending on librenderengine"
2022-12-14 16:21:13 +00:00
Brian Lindahl
d103cd6828
Add VTS readback tests for buffer slot clearing
...
Bug: 258196272
Test: atest VtsHalGraphicsComposer3_ReadbackTest
Test: atest VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I95d24f9cf10d95e54bc228c02bedab9a8281cfd1
2022-12-09 14:31:39 -07:00
Nolan Scobie
a61ca2a872
Add librenderengine_deps to targets depending on librenderengine
...
See I46750a0336a29d8d32ad2cb79a71c90461272fce for context.
Bug: 259248961
Test: presubmit builds
Change-Id: Ibd8b75406bd79dab6bc20aeaad0d08c9fcdfeb41
2022-12-07 11:48:27 -05:00
Treehugger Robot
344f7933ed
Merge "Update OWNERS" am: 0ea6e013ef am: 91b8d6b035 am: 27ae2a7bef
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2282841
Change-Id: I99f6ab3a12e225cacbbaeffc9d28cd5b9451d3f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-02 20:40:19 +00:00
John Reck
15703c76af
Update OWNERS
...
Remove all subfolder OWNERS in favor of single top-level
Update top-level OWNERS
Fixes: 230785548
Test: n/a
Change-Id: I9e4f4fa7938e31f0caf864836889f8ebb5ca5675
2022-11-02 12:36:41 -04:00
Sally Qi
a1c66a2993
Add cc_defaults wrapper for android.hardware.graphics.allocator ndk
...
package.
- to avoid manually rev up if needed.
Bug: 243429120
Test: builds
Change-Id: I25bfcc203cda61af308c37c3766fa9efe6c6784c
Merged-In: I25bfcc203cda61af308c37c3766fa9efe6c6784c
2022-10-20 18:27:12 -04:00
Sally Qi
0435c6b4f3
Add cc_defaults wrapper for android.hardware.graphics.allocator ndk
...
package.
- to avoid manually rev up if needed.
Bug: 243429120
Test: builds
Change-Id: I25bfcc203cda61af308c37c3766fa9efe6c6784c
2022-09-01 13:28:00 -07:00
Sally Qi
784c253a05
Add cc_defaults as wrapper for graphics composer/common AIDL
...
interfaces.
- Add new Android.bp in graphics folder and wrap composer and common
AIDL in to separate cc_defaults.
- remove composer3 dependency from allocator's VTS .bp file.
Bug: 243429120
Test: builds
Change-Id: Ia91e4ab87b7ac86248094317185b317d5604e654
2022-08-26 15:18:42 -07:00
Patrick Williams
af78e0ad80
Replace RenderEngineResult with FenceResult
...
Bug: b/232535621
Test: refactor, existing tests pass
Change-Id: I86fe498246e45d199a47008a3fb90af3030e83d6
2022-08-24 20:00:40 +00:00
ramindani
b2b747ffd4
[VTS] Update allocator name for AIDL allocator.
...
We used "default" value for the allocator in the test
and this value was used as is for the AIDL allocator.
This caused the test to fail because we were not able to acquire the
appropriate allocator as AIDL allocator instance is not named "default".
Update the test to use the correct instance name for AIDL allocator,
if available.
Test: atest VtsHalGraphicsComposerV2_1TargetTest
atest VtsHalGraphicsComposerV2_2TargetTest
atest VtsHalGraphicsComposerV2_3TargetTest
atest VtsHalGraphicsComposerV2_4TargetTest
atest VtsHalGraphicsComposer3_TargetTest
BUG: 234671596
test results after updates:
VTS 2.1 : http://ab/I84600010058657636
VTS 2.2 : http://ab/I51800010058498973
VTS 2.3 : http://ab/I87700010058914863
VTS 2.4 : http://ab/I88900010058592031
VTS 3.0 : http://ab/I96200010058838905
Change-Id: I04ae1a18d757cfd941d4929ad08f6bb2c8643f76
2022-06-07 23:33:12 +00:00
Alec Mouri
38ccfd7a29
Tweak IMapper 4.0 VTS to run with AIDL IAllocator
...
When there is no HIDL IAllocator installed on the device, then these
tests must still run.
Bug: 231982605
Test: VtsHalGraphicsMapperV4_0TargetTest
Change-Id: If7503d398c03086df470971cc2c10029270525f9
2022-05-23 18:38:37 +00:00
Alec Mouri
55f76ca7af
Update renderengine dependency to VTS
...
Bug: 218954037
Test: builds
Change-Id: I31f8a8764fa66a9aec4762354c425ba1442ef351
Merged-In: I31f8a8764fa66a9aec4762354c425ba1442ef351
2022-03-31 01:16:14 +00:00
Treehugger Robot
fa31414317
Merge "Add alecmouri to composer OWNERS" am: d89d96d196 am: b766496521 am: 8f8f639518 am: a44e520716
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1949687
Change-Id: Ia2074f2f0d8cdbc8546b9eda7e3ab1759ed2d578
2022-01-14 22:37:21 +00:00
Ady Abraham
7b957abe49
Add alecmouri to composer OWNERS
...
Change-Id: I01a0958e1371ba0e6a92d7f5f0d19ce0acdb7604
2022-01-14 17:10:25 +00:00
Vishnu Nair
59329712a9
Update VTS to use ExternalTexture impl
...
We want to expose GraphicBuffer properties via
ExternalTexture class and within, SurfaceFlinger access the
buffer via this proxy interface. This allows us to inject
and mock GraphicBuffers as needed. Specifically this will
be used to recreate layer state from transaction traces.
Test: compiles
Bug: 200284593
Change-Id: If2b6c43bb5b302fbc49dfa49d6ac1f79f92f30f7
2022-01-14 02:06:17 +00:00
Alec Mouri
ece0bc399c
Link in libshaders into composer VTS
...
Bug: 200309590
Test: builds
Change-Id: I71df8b0ea3b5df2ba09861bb3cd11645595f09bc
2021-11-24 12:23:48 -08:00
Long Ling
abc390baae
Merge "Fix comile error for pixel aidl hwc"
2021-11-12 04:39:26 +00:00
Alec Mouri
256264dc1f
Link in libtonemap into composer VTS
...
Bug: 200310159
Test: builds
Change-Id: I9183cf2bcb11a837ab2f27d9210f3c30f02d093a
2021-10-29 14:39:00 -07:00
Long Ling
2997151fae
Fix comile error for pixel aidl hwc
...
Bug: 201321174
Change-Id: Ib64dce591232e62985f72dffff22792fe908407a
2021-10-13 15:54:47 -07:00
Sally Qi
d515dbade2
Revert "Revert "Fix vts cases due to function change for async r..."
...
Revert^2 "Second Patch for async RenderEngine"
2109270e74a18585aceffc94d1758cee47bb4175
Bug: 202843200
Bug: 202833127
Bug: 202808760
Test: this
Change-Id: I504d2974d97e78431dc5d7e572e8ae70690dc34c
2021-10-13 11:15:13 -07:00
Sally Qi
a56868b854
Fix Vts drawLayers function for async renderengine change
...
Bug: 180657548
Test: this
Change-Id: I8980d843599fe8b8195f6a1b8540b5d13528ac4b
2021-08-17 17:13:26 -07:00
Marin Shalamanov
513ae73a91
VTS: Free allocated buffers
...
The native handle was not freed which causes some devices to
run out of memory when executing the test. This change
creates a RAII wrapper around native_handle_t, which
automatically deallocates buffers when they go out of scope.
Bug: 188686850
Test: atest VtsHalGraphicsComposerV2_4TargetTest
Change-Id: I19a22a5a3202e048de77926ce4a116a31d9de906
2021-06-16 12:46:56 +02:00
Alec Mouri
2a6ef4e566
Revert "Revert "Update Readback VTS to align with RenderEngine i..."
...
Revert "Revert "Update WaylandRenderSurface to accomodate interf..."
Revert "Revert "Add ExternalTexture class into RenderEngine inte..."
Revert submission 14199598-revert-14086921-renderengine-external-tex-QJNBWQMQEU
Reason for revert: Prepare for relanding
Reverted Changes:
I01e65a7f4:Revert "Update WaylandRenderSurface to accomodate ...
I7d58118c1:Revert "Update Readback VTS to align with RenderEn...
I1501890f4:Revert "Add ExternalTexture class into RenderEngin...
Change-Id: Ic2ee9311d22658ac77c8a94f6070324cf07b601b
2021-04-16 16:36:21 +00:00
Alec Mouri
51daee615f
Revert "Update Readback VTS to align with RenderEngine interface..."
...
Revert "Update WaylandRenderSurface to accomodate interface change"
Revert "Add ExternalTexture class into RenderEngine interface"
Revert submission 14086921-renderengine-external-tex
Reason for revert: Potential culprit for b/185361988
Reverted Changes:
I7796764e2:Update WaylandRenderSurface to accomodate interfac...
I13904eec4:Update Readback VTS to align with RenderEngine int...
I222c71e6e:Add ExternalTexture class into RenderEngine interf...
Change-Id: I7d58118c1c2284a04eb52e992e901d82faaf5bb0
2021-04-15 16:27:01 +00:00
Alec Mouri
bdd7e7e511
Update Readback VTS to align with RenderEngine interface change
...
RenderEngine no longer directly takes in GraphicBuffer objects. Instead,
it takes in ExternalTexture types that manage resources associated with
a GraphicBuffer.
Bug: 180767535
Test: builds
Change-Id: I13904eec491fce223b6178fa5571589b67402865
2021-04-13 11:01:50 -07:00
Ady Abraham
203bdee456
Vts: Add missing usage to buffer
...
The test's buffer is read by the GPU and therefore needs to be allocatted with
BufferUsage::GPU_TEXTURE
Fixes: 182935868
Change-Id: I7795e6a32acdf3ecf76003bd12715fcaf73a4e71
Test: VtsHalGraphicsComposerV2_2TargetTest
2021-03-17 03:32:59 +00: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
Ady Abraham
770022b56d
Merge "Remove stoza@ from OWNERS" am: 04f36f9465 am: 73212deb28 am: 9dc7f4e961
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1576523
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife3a63e2f5c3d7c0bab7c069a7c1747a91a71984
2021-02-06 02:31:36 +00:00
Dan Stoza
fab392342d
Remove stoza@ from OWNERS
...
Removing stoza@ (and other stale entries) from OWNERS since he's leaving
Bug: N/A
Test: N/A
BYPASS_INCLUSIVE_LANGUAGE_REASON=Correct pronouns for stoza@
Change-Id: Ic372a1ce4f27fdf8a1faf9b6f66792d729acbe99
2021-02-04 20:10:14 +00:00
Ana Krulec
02ee09f588
SF: RenderEngine->drawLayers takes Graphic Buffer instead of ANativeWindow
...
see ag/10392154 for more information
Test: RenderEngineVts
Change-Id: I75198d2d9fa43013d6497c1c2a393fa3d62c7708
2020-02-23 17:32:27 -08:00
Adam Bodnar
6c3929cc33
Explicitly destroy render engine in RenderEngineVts
...
The GLES driver appears to be left in a bad state without destroying the
render engine instance explicitly after every test case.
Bug: 149043811
Test: build, adb push out/target/product/<platform>/testcases/VtsHalGraphicsComposerV2_2TargetTest/<abi>/VtsHalGraphicsComposerV2_2TargetTest /data/local/tmp && adb shell /data/local/tmp/VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I8e3c4e30eaa2ef3b9831da7b335b9a830be4b4ed
2020-02-18 13:34:27 -08:00
Dan Shi
b5fd31a128
Remove reference of VtsHalHidlTargetTestBase
...
All grahpics composer HAL tests have been converted to parameterized
gtest.
Bug: 147894326
Test: atest VtsHalGraphicsComposerV2_1TargetTest \
VtsHalGraphicsComposerV2_2TargetTest \
VtsHalGraphicsComposerV2_3TargetTest \
VtsHalGraphicsComposerV2_4TargetTest
Change-Id: I84515a5698035d7ceb299a5cc140ecd7bb28fe84
2020-02-01 13:27:55 -08:00
Vishnu Nair
02da997fab
Change RenderEngine::drawLayers to take a vector of LayerSettings pointers
...
Prework for the client composition cache logic which extends
LayerSettings. Passing in a set of pointers will reduce the
amount of copying needed when passing the LayerSettings to
RenderEngine.
Bug: 136561771
Test: atest librenderengine_test libcompositionengine_test
Test: atest VtsHalGraphicsComposerV2_2TargetTest
Test: go/wm-smoke
Change-Id: I0581be7762bf56cd7a3aab0511adf95cd6e2df76
2020-01-18 00:55:51 +00:00
Peiyong Lin
ad96dd9f12
[composer] Add createCommandWriter to command engine.
...
Command engine always uses V2.1 CommandWriterBase, change the creation of
command writer inside command engine so that we can use the right version of
command writer.
BUG: b/147365206
Test: build and boot.
Change-Id: I61fbbce19a44244725621e9a1cef750bd4c78b4d
2020-01-09 13:48:16 -08:00
Peiyong Lin
96ee56bcd8
Remove beginCommand variants with a helper template.
...
BUG: b/147365206
Test: boot
Change-Id: I30715fe3e1c221ba366bf521fbd531636136f0c9
2020-01-08 14:55:20 -08:00
TreeHugger Robot
7a8f64c17b
Merge "graphics: fix failed VTS cases"
2019-11-27 20:34:30 +00:00
Peiyong Lin
a5aedc3293
Clean up BeginCommand.
...
BUG: N/A
Test: build, flash and boot
Change-Id: Ife6132307152e271548a54e11a472751c52d95e4
2019-11-25 16:18:58 -08:00
Long Ling
0d3fe0857a
graphics: fix failed VTS cases
...
Return BAD_DISPLAY or BAD_PARAMETER as expected.
Bug: 140158240
Test: run vts -m VtsHalGraphicsComposerV2_2Target
Change-Id: I0f5a7103bc134ed87984bd13248aee7597a95d68
2019-11-14 11:27:00 -08:00
Chong Zhang
86e1aebad1
[RenderEngine] Fix test build for RenderEngine refactor
...
Fix build after refactor of creation flags.
BUG: 142331374
Test: build, flash and boot
Change-Id: I59c2858f8e35426e2eb08c91e8797efd738a3922
2019-10-23 12:28:08 -07:00
Marissa Wall
53aff11b36
composer-vts: support gralloc 4
...
Add support for gralloc 4.0 to composer-vts.
Bug: 136016160
Test: Compiles and boots
Change-Id: Ibfa802023ddeb3b4d09a7b69bbc796b67c4ee62d
2019-08-20 10:07:06 -07:00
Marissa Wall
a8c3130a34
composer: refactor ComposerResources into shared library
...
composer@2.x-hal is a header library. Any of the shared
libraries it depends on must also be included by anyone
who includes composer@2.x-hal. This means when we add a new
version of mapper, anyone who uses composer@2.x-hal must
also include the new version of the mapper. Vendors
that depend on composer@2.x-hal are broken every time we
add a new mapper.
This patch refactors ComposerResources into a seperate
shared library. ComposerResources contains all of the
mapper code. composer@2.x-hal will depend on the new
composer@2.x-resource hal. Everyone downstream must
also add the composer@2.x-resource file now. However,
they will not be broken again when we add a new mapper
version.
Bug: 136016160
Test: Compiles and boots
Change-Id: I208a954a941ed65938074cd3efb8a6893a2bc1eb
2019-08-16 10:48:37 -07:00
Adam Bodnar
d0aef4dfe5
Add more HWC vs RenderEngine tests to composer vts
...
Bug: 133411821
Test: build, boot, VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I19322f75b098813b1e4acf31cb6bae9e15fb8915
2019-08-14 15:06:45 -07:00