Commit graph

837 commits

Author SHA1 Message Date
Jeongik Cha
38533915d1 Specify version for aidl_interface explicitly
Bug: 150578172
Test: m
Change-Id: I141de8ed6958fe42f727a0fa41473de4c1fb38de
2021-01-28 00:49:49 +09:00
Marin Shalamanov
2c05bb003a VTS: Test that configs in a group differ only by vsync period am: 6f36dd6e31 am: e834cea452 am: 7f31d5fda4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533539

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf4d83b6fee875da9d5a15e334b0b691a676752d
2020-12-28 20:36:01 +00:00
Marin Shalamanov
6f36dd6e31 VTS: Test that configs in a group differ only by vsync period
All display configs in a config group must have the same resolution
and DPI (if DPI attributes are supported by HWC).

Fixes: 172902326
Test: atest VtsHalGraphicsComposerV2_4TargetTest
Change-Id: Id86fe7983a12e33d2d9c3b88ee68d6e18485e87d
2020-12-28 19:35:49 +00:00
Midas Chien
3b069c909c composer: vts: allocate buffer larger or equal to crop size
Ensure buffer size larger than crop size.

Bug: 175028291
Test: VtsHalGraphicsComposerV2_4TargetTest on Pixel 4, 5
Change-Id: I6528ac6989ca557d9f578b0119715a6688bb6d5d
2020-12-21 21:35:49 +08:00
Xin Li
c371fcd552 DO NOT MERGE - Merge RQ1A.201205.011
Bug: 172690556
Merged-In: I3962ede51ce823368c62c4e4e5fb30f7a5680bdf
Change-Id: Ia68bf79ad9a0782e2818a2abfda69ad0d2122101
2020-12-07 00:39:42 -08:00
TreeHugger Robot
7fa2e6b058 Merge "composer: fix 2.4 vts for multi-display" 2020-12-03 19:42:26 +00:00
Ady Abraham
93de2043a8 composer: fix 2.4 vts for multi-display
Fix the way the test handles multi-displays by caching
all the hotplug events received when registering the callback

Test: VTS on Pixel 4
Bug: 174174253
Change-Id: I9a69b18bcef0722e603f2ca58cfbd176ea60f5f2
Merged-In: I9a69b18bcef0722e603f2ca58cfbd176ea60f5f2
2020-12-03 18:21:40 +00:00
Ady Abraham
be3fce4193 composer: fix 2.4 vts for multi-display
Fix the way the test handles multi-displays by caching
all the hotplug events received when registering the callback

Test: VTS on Pixel 4
Bug: 174174253
Change-Id: I9a69b18bcef0722e603f2ca58cfbd176ea60f5f2
2020-12-02 15:08:39 -08:00
Treehugger Robot
77cbc78937 Merge "Support waiting for surfaceflinger service to stop before test starts" am: 1d8b9fc0b7 am: e814075692 am: 41d7e091e9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1486339

Change-Id: I967f4c441ba2bce676c6a5716117a4b58bc2c80e
2020-12-02 09:57:54 +00:00
Treehugger Robot
41d7e091e9 Merge "Support waiting for surfaceflinger service to stop before test starts" am: 1d8b9fc0b7 am: e814075692
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1486339

Change-Id: Ia70111ed021dc7f52dedd7f9f3c9b0530802a996
2020-12-02 08:57:45 +00:00
Treehugger Robot
1d8b9fc0b7 Merge "Support waiting for surfaceflinger service to stop before test starts" 2020-12-02 07:43:07 +00:00
TreeHugger Robot
a27def9b35 Merge "Move a.h.g.composer@2.1-resources into system_ext" 2020-11-19 20:56:36 +00:00
Roman Kiryanov
3c44b5f8c3 Move a.h.g.composer@2.1-resources into system_ext
it is not a part of the system according to
generic_system.mk.

Bug: 173538619
Bug: 167689596
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I407d3a99c8b458d31fbc0ae891ae7a685ffb2660
2020-11-19 11:04:18 -08:00
Marin Shalamanov
5141f54b50 Merge "Clarify the ComposerClient comment for CONFIG_GROUP" am: f344363e64 am: 281a5870d0 am: ae48e3ae6f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1497983

Change-Id: I71bc6d2b79dc82d8a8fb12a01244ccd244e8d194
2020-11-19 15:01:36 +00:00
Marin Shalamanov
37c5495c52 Clarify the ComposerClient comment for CONFIG_GROUP
Clarify that configs with the same group should differ only
by refresh rate.

Test: n/a
Merged-In: I2b09689825fc9564665324ff18eb1907765b9016
Change-Id: I2b09689825fc9564665324ff18eb1907765b9016
2020-11-19 10:49:53 +00:00
Marin Shalamanov
657404c22c Clarify the ComposerClient comment for CONFIG_GROUP
Clarify that configs with the same group should differ only
by refresh rate.

Test: n/a
Change-Id: I2b09689825fc9564665324ff18eb1907765b9016
2020-11-18 12:02:30 +01:00
Ana Krulec
aad9fe4a2e Merge "Moving composer@2.1 library away from shared" am: 762a556c11 am: f9db4a4fcd am: 6f15603c5d am: d19d0297c0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1484877

Change-Id: I7b293f1f8c291a2253c6dd6bf4411981f3560d70
2020-11-03 19:33:35 +00:00
Dan Shi
e25724e411 Support waiting for surfaceflinger service to stop before test starts
Bug: 168787663
Test: atest VtsHalGraphicsComposerV2_1TargetTest \
  VtsHalGraphicsComposerV2_2TargetTest \
  VtsHalGraphicsComposerV2_3TargetTest
Change-Id: I1219b8446ca3ac3d22f3fd6ab72cd8a214f55545
2020-11-03 11:33:01 -08:00
Ana Krulec
d19d0297c0 Merge "Moving composer@2.1 library away from shared" am: 762a556c11 am: f9db4a4fcd am: 6f15603c5d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1484877

Change-Id: Ie805ad8b5ae8cf0474ff0b5d82996aa823261bb1
2020-11-03 18:24:35 +00:00
Ana Krulec
564eab6f01 Moving composer@2.1 library away from shared
Adding the ability for tests to add
"android.hardware.graphics.composer@2.1-resources" as
as static library.

Test: atest sffakehwc_test on cuttlefish on aosp-master
Bug: 160796914
Change-Id: I8cb80102bd836f8f211602cb36fd857757e8323c
2020-11-02 18:07:37 -08:00
Marin Shalamanov
7e96241e82 Merge "Clean ComposerClient cache on hotplug" 2020-10-27 14:14:33 +00:00
Marin Shalamanov
ac6cc1f97e Clean ComposerClient cache on hotplug
On subsequent hotplug connected event for a display
SurfaceFlinger destroys the previous framebuffers and
recreates them. When the new buffers are created
ComposerClient still holds a handle to the old buffers and
they are not destroyed. This way the new framebuffers
may get allocated on non continuous memory causing garbled
screens for the user.

Bug: 160112047
Bug: 169255692
Test: 1. limit cma ion memory to 32 MB
      2. flash device
      3. plug hdmi out and in
      4. verify that the display image is not garbled
Change-Id: Idf7cdf7a070ffc83ecec34ac24c8a7d696f68aa6
2020-10-27 13:37:40 +01:00
stevensd
55493667bd Merge "graphics: fix use-after-free in mapper 2.0 passthrough" am: 2d82c11b0f am: 4d7af21173 am: 2213315dff am: c384897178
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1468882

Change-Id: Ib5a6b58f5607e071c559192e028b43329247651c
2020-10-27 02:03:50 +00:00
stevensd
c384897178 Merge "graphics: fix use-after-free in mapper 2.0 passthrough" am: 2d82c11b0f am: 4d7af21173 am: 2213315dff
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1468882

Change-Id: I39ef92439dee2658a592f80b53a32ac8e3440ec1
2020-10-27 01:42:41 +00:00
stevensd
2d82c11b0f Merge "graphics: fix use-after-free in mapper 2.0 passthrough" 2020-10-27 00:35:56 +00:00
David Stevens
be8f52e8b0 graphics: fix use-after-free in mapper 2.0 passthrough
The mapper 2.0 gralloc passthrough keeps a set of the native_handle_t
pointers of all imported buffers. This change ensures that the
underlying HAL wrapper freeing the native_handle_t is performed
atomically with respect to accesses to the passthrough's native_handle_t
pointer set.

This fixes a race where a native_handle_t could be reallocated between
being freed by the HAL wrapper and removed from the passthrough's set,
which could then cause the import which happened to reallocate that
native_handle_t to spuriously fail.

Bug: 170798776
Test: Manually very no more spurious import failures in ARCVM's decoder.
Change-Id: I654a44e94adb319f54fb462f4484db414ca1b154
2020-10-22 09:45:09 +09:00
Steven Moreland
18dedeba31 Merge "Update VNDK version for common graphics HALs." into rvc-d1-dev-plus-aosp am: 6771686697
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12875930

Change-Id: I3ad6da3bd6e1c51517b0cb40aeee191cb4eb3c38
2020-10-20 20:42:34 +00:00
Steven Moreland
67f5d0f838 Update VNDK version for common graphics HALs.
We are adding things to them, and in order for core libraries like libui
to use them, the newer versions need to be in the VNDK.

Bug: 170435409
Test: build
Change-Id: I4094240656f357b5ae52194befd0e10627b9fe23
Merged-In: I4094240656f357b5ae52194befd0e10627b9fe23
2020-10-19 21:04:14 +00:00
Steven Moreland
6006eb1b82 Update VNDK version for common graphics HALs.
We are adding things to them, and in order for core libraries like libui
to use them, the newer versions need to be in the VNDK.

Bug: 170435409
Test: build
Change-Id: I4094240656f357b5ae52194befd0e10627b9fe23
Merged-In: I4094240656f357b5ae52194befd0e10627b9fe23
2020-10-19 19:22:53 +00:00
Steven Moreland
e04821595c Update VNDK version for common graphics HALs.
We are adding things to them, and in order for core libraries like libui
to use them, the newer versions need to be in the VNDK.

Bug: 170435409
Test: build
Change-Id: I4094240656f357b5ae52194befd0e10627b9fe23
2020-10-19 18:07:57 +00:00
Ady Abraham
1019a17a92 composer: hold a sp<IComposer> from the service itself
IComposerClient assumes that IComposer will outlive its life cycle
and holds a simple pointer to HwcHal. This change is taking the same
approach of newer composer versions (2.2, 2.3, and 2.4) to make sure
that IComposer would outlive IComposerClient.

Test: coral booting with this change
Fixes: 155769496
Change-Id: I3962ede51ce823368c62c4e4e5fb30f7a5680bdf
Merged-In: I3962ede51ce823368c62c4e4e5fb30f7a5680bdf
(cherry picked from commit 43e42ff6ec)
(cherry picked from commit 1368c29213)
2020-10-13 01:08:04 +00:00
Ady Abraham
5d4d79d9de composer: hold a sp<IComposer> from the service itself am: 1368c29213
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12754286

Change-Id: Ia3f955a51bde0549072afdf35b92a9de28a065a6
2020-10-05 20:30:47 +00:00
Ady Abraham
1368c29213 composer: hold a sp<IComposer> from the service itself
IComposerClient assumes that IComposer will outlive its life cycle
and holds a simple pointer to HwcHal. This change is taking the same
approach of newer composer versions (2.2, 2.3, and 2.4) to make sure
that IComposer would outlive IComposerClient.

Test: coral booting with this change
Fixes: 155769496
Change-Id: I3962ede51ce823368c62c4e4e5fb30f7a5680bdf
Merged-In: I3962ede51ce823368c62c4e4e5fb30f7a5680bdf
(cherry picked from commit 43e42ff6ec)
2020-10-05 18:09:08 +00:00
TreeHugger Robot
e601b1ca37 Merge "composer: hold a sp<IComposer> from the service itself" 2020-10-01 22:56:15 +00:00
Ady Abraham
43e42ff6ec composer: hold a sp<IComposer> from the service itself
IComposerClient assumes that IComposer will outlive its life cycle
and holds a simple pointer to HwcHal. This change is taking the same
approach of newer composer versions (2.2, 2.3, and 2.4) to make sure
that IComposer would outlive IComposerClient.

Test: coral booting with this change
Fixes: 155769496
Change-Id: I3962ede51ce823368c62c4e4e5fb30f7a5680bdf
2020-10-01 20:12:38 +00:00
Marin Shalamanov
5127a97bd8 Update the comment for ReplacedHandle
Test: n/a
Bug: n/a
Change-Id: I388af766fb1b5e78aabfc72c70883e71d05ce18c
2020-09-29 16:04:49 +02:00
Dan Shi
8d5281da2e Rename vts-core to vts
Bug: 151896491
Test: none
Change-Id: If74547c56b46ebc7fd728c1bf52fe9dedac65ffa
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-09-29 06:52:57 +00:00
Dan Shi
2fdd0c5c39 Rename vts-core to vts
Bug: 151896491
Test: none
Change-Id: If74547c56b46ebc7fd728c1bf52fe9dedac65ffa
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-09-29 06:52:28 +00:00
Treehugger Robot
527ce01e45 Merge "Mark GraphicsMapperHidlTest as allowing not being instantiated" am: ca31517201
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1439141

Change-Id: Ifa90d54ebe8ab99f36daba611a0d63f3f6fa8fdb
2020-09-28 22:03:07 +00:00
Treehugger Robot
ca31517201 Merge "Mark GraphicsMapperHidlTest as allowing not being instantiated" 2020-09-28 21:47:07 +00:00
Dan Shi
f2b950f470 Rename vts-core to vts
Bug: 151896491
Test: none
Change-Id: If74547c56b46ebc7fd728c1bf52fe9dedac65ffa
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-09-26 04:11:28 +00:00
Chris Forbes
3c9a3a0cd1 Mark GraphicsMapperHidlTest as allowing not being instantiated
Only the variant(s) actually implemented by the device will be
instantiated.

This is consistent with tests for other versioned or optional HALs.

Bug: b/167222309
Test: atest VtsHalGraphicsMapperV2_0TargetTest:GoogleTestVerification#UninstantiatedParameterizedTestSuite<GraphicsMapperHidlTest> -- --abi arm64-v8a
Change-Id: I4f1bfbad47bdbf75578ec48a3a56fb5351e7729a
2020-09-25 21:07:53 -07:00
John Reck
066a7d944c Add missing skia_deps
Test: make
Change-Id: I51e664120fd9fb6f574b5676eedca63df2c13951
2020-09-14 13:26:30 -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
Dan Shi
6b0fd062bb Suppress gtest error for tests without any instance
Bug: 162052785
Test: m -j vts
Change-Id: I627d6790aa08aa9c6e3c5b8bdc533213ee08de21
2020-09-08 10:42:38 -07:00
Chris Forbes
48d97f3921 Mark GraphicsMapperHidlTest as allowing not being instantiated
Only the variant(s) actually implemented by the device will be
instantiated.

This is consistent with tests for other versioned or optional HALs.

Bug: b/167222309
Test: atest VtsHalGraphicsMapperV2_0TargetTest:GoogleTestVerification#UninstantiatedParameterizedTestSuite<GraphicsMapperHidlTest> -- --abi arm64-v8a
Change-Id: I4f1bfbad47bdbf75578ec48a3a56fb5351e7729a
2020-08-31 17:14:39 -07:00
Dan Shi
ff985a85a8 Suppress gtest error for tests without any instance
Bug: 162052785
Test: m -j vts
Change-Id: I58bc808a82b2128bb8774f762f9b9fcecd2614fb
2020-07-29 09:46:36 -07:00
Ady Abraham
2fb43f0108 composer: 2.4: fix VTS usage of desired time am: 30d2573834 am: b672893691 am: 30261db626 am: 81650b5cb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12171999

Change-Id: If06626d941d1f7588fbf51edb32f0e42e780073d
2020-07-16 22:20:10 +00:00
Ady Abraham
30261db626 composer: 2.4: fix VTS usage of desired time am: 30d2573834 am: b672893691
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12171999

Change-Id: Ibbdc435742ff5d89553ae178c3924306400e8ca8
2020-07-16 21:26:54 +00:00
Ady Abraham
8c33403a10 composer: 2.4: fix VTS usage of desired time am: 30d2573834
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12171999

Change-Id: I41b741a51c52e8e09e20e2dbd7f46c2b2238f840
2020-07-16 21:15:52 +00:00