Commit graph

1155 commits

Author SHA1 Message Date
Leon Scroggins III
830a0b445e Add DisplayCapability::DISPLAY_DECORATION
Bug: 193170859
Test: manual
Test: TODO (b/212697197)
Change-Id: I5e5efe671f0b3d724bafeff93e2d97007cb167ab
2021-12-30 12:47:13 -05:00
Leon Scroggins
3519a109bd Merge "Reland "Update documentation for DISPLAY_DECORATION"" 2021-12-29 13:01:54 +00:00
Ram Indani
4430c6ce25 Merge "composer: fix null pointer dereference" 2021-12-28 16:52:57 +00:00
Leon Scroggins
2efab6cd3c Reland "Update documentation for DISPLAY_DECORATION"
The first time this topic landed, it resulted in b/212402133. We avoid
running into this bug with Ib11d46439db57b90486bad07dd90f2cf0822182a.

Remove references to 8 bit alpha.

Original commit message:

After some discussion, we've decided to always set the ScreenDecorations
to DISPLAY_DECORATION. HWC can decide, based on the format, whether to
truly treat it as DISPLAY_DECORATION, or to change to DEVICE
composition.

Update the documentation to reflect this change.

See also I1da3199bacf5877e88876249c60c0a33fcd44c1e.

Bug: 193170859
Test: NA

Change-Id: Iaf5385c38f6827e07b91a9a0a8769fb7a125e847
2021-12-28 11:30:25 -05:00
Ady Abraham
435fd2fda1 composer: fix null pointer dereference
The test process was crashing on null pointer instead of exiting
successfully, so fixing the null pointer error.

Test: VTS
Change-Id: I1d6988d25ed58c159adc49d43d36e4b3f0ffa289
2021-12-23 16:23:26 -08:00
Ady Abraham
11840523cd Merge "composer: remove translate-ndk" 2021-12-23 23:58:57 +00:00
Leon Scroggins
80b5caec3e Merge "Revert "Update documentation for DISPLAY_DECORATION"" 2021-12-23 21:55:09 +00:00
Ady Abraham
f825cd7768 Merge changes from topic "b_208856704"
* changes:
  composer: cleanup CommandWriterBase and CommandReaderBase part 2
  composer: make PresentOrValidate.Result consistent with hidl
2021-12-23 21:27:08 +00:00
TreeHugger Robot
33e36ef1dc Merge "composer: rename ClockMonotonicTimestamp.timestamp" 2021-12-23 21:07:40 +00:00
Leon Scroggins
fa7e058b5e Revert "Update documentation for DISPLAY_DECORATION"
Revert "Add/plumb SurfaceControl.DISPLAY_DECORATION"

Revert "Add eLayerIsDisplayDecoration flag"

Revert submission 16511727-wm_DISPLAY_DECORATION

Reason for revert: b/211835607
Reverted Changes:
I1da3199ba:Allow changing composition from DISPLAY_DECORATION...
I1fae74b36:Update documentation for DISPLAY_DECORATION
I1da03a88f:Add eLayerIsDisplayDecoration flag
I7f22dfd03:Add/plumb SurfaceControl.DISPLAY_DECORATION

Change-Id: I7238bcc96325873ec7dbdd42894192c48e7cf92e
2021-12-23 15:28:46 +00:00
Ady Abraham
c4fd63353d composer: remove translate-ndk
- No one is using the translate functions, so removing.
 - Rename the static_assert portion to Hidl2AidlAsserts

Test: build
Change-Id: I42abc37953e1d927a3bcf5f60f56acf99fde6bf5
2021-12-22 21:59:35 -08:00
Ady Abraham
46219f5731 composer: cleanup CommandWriterBase and CommandReaderBase part 2
Bug: 208856704
Test: VTS
Change-Id: I30f4cfef66a1c833142b4645f69e8ad9fbf0de8e
2021-12-22 21:58:57 -08:00
Ady Abraham
b9b5df3ce5 composer: make PresentOrValidate.Result consistent with hidl
HIDL expects that Presented will be 1 and Validated witll be 0.
Even though we map the enum values of PresentOrValidate.Result
to the correct value, this CL makes the interface consistent with
the HIDL so that we can directly use the enum value.

Bug: 208856704
Test: VTS
Change-Id: I9fb2421e32c2288c5495422eda6764f6102337f0
2021-12-22 21:58:57 -08:00
Ady Abraham
8d65de5874 composer: rename ClockMonotonicTimestamp.timestamp
Rename ClockMonotonicTimestamp.timestamp to
ClockMonotonicTimestamp.timestampNanos to improve readability.

Fixes: 211801233
Test: build
Change-Id: Ia71525fd9ccb77d871857f60dac29ac9198c0258
2021-12-22 16:54:14 -08:00
Ady Abraham
f98cd3a9fe Merge "Remove GenericMetadata from composer3" 2021-12-23 00:28:11 +00:00
TreeHugger Robot
e00550775b Merge "composer: release fence can be null" 2021-12-23 00:17:38 +00:00
Ady Abraham
5b2858b709 Merge changes from topics "b_208879711", "hwc_present_time"
* changes:
  composer: DisplayCommand.colorTransform is just a matrix
  composer: pass expetcedPresentTime
2021-12-22 23:14:05 +00:00
Ady Abraham
dc6dd69948 composer: release fence can be null
Add @nullable to the releaseFence in IComposerClient.setReadbackBuffer
as it can be null, if the buffer is ready to be consumed.

Bug: 210166943
Test: VTS
Change-Id: Ic556ceabd22ba8acddf37ca7d9a6d14d41697c5b
2021-12-22 22:52:58 +00:00
Ady Abraham
654a3287ae Remove GenericMetadata from composer3
There are no current users for GenericMetadata, so removing
from composer 3.

Bug: 209691612
Test: VTS
Change-Id: I729a3646d9684c78454708fd15f1571aa405e9bb
2021-12-21 23:09:02 +00:00
Ady Abraham
8de9885800 composer: DisplayCommand.colorTransform is just a matrix
Remove the hint from DisplayCommand.colorTransform as currently
we only use ColorTransform::IDENTITY and ColorTransform::ARBITRARY_MATRIX,
which both can be expressed using a matrix.

Bug: 208879711
Test: VTS
Change-Id: Ibb24593e3d0af5afdc8f3f79de2fc22eeccfcea8
2021-12-21 14:04:33 -08:00
Leon Scroggins III
64803940e6 Update documentation for DISPLAY_DECORATION
After some discussion, we've decided to always set the ScreenDecorations
to DISPLAY_DECORATION. HWC can decide, based on the format, whether to
truly treat it as DISPLAY_DECORATION, or to change to DEVICE
composition.

Update the documentation to reflect this change.

See also I1da3199bacf5877e88876249c60c0a33fcd44c1e.

Bug: 193170859
Test: NA
Change-Id: I1fae74b360d1b9d79fc4afeab6f71089d4c8b7e5
2021-12-20 23:08:13 -05:00
Ady Abraham
72c5b503e5 composer: pass expetcedPresentTime
Add expectedPresentTime as an optional field to DisplayCommand.

Test: VTS
Bug: 198186194
Change-Id: I1203422b5d052508ca42a80da5d252c106efc5ee
2021-12-20 19:30:11 -08:00
Treehugger Robot
02878aa564 Merge "fix VtsHalGraphicsComposerV2_2TargetTest timeout failed" am: 81c9e603ea am: f864ffeb60 am: f5d2e9f8b8 am: 9506712ee3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1921757

Change-Id: I91028f31c1f571e31ba47695c4401738a3625b87
2021-12-16 23:33:15 +00:00
Ady Abraham
898e6d6aad Merge "composer: cleanup CommandWriterBase and CommandReaderBase" 2021-12-16 19:38:54 +00:00
Kui1 Wu
ada2850cfb fix VtsHalGraphicsComposerV2_2TargetTest timeout failed
run VtsHalGraphicsComposerV2_2TargetTest will timeout failed
when there is dual displays. use `std::unordered_set` Display type,
`std::vector<Display>(mDisplays.begin(), mDisplays.end())` as
getDisplays return value, mDisplays elements order may not be
same as the order of hotplug events during boot matters.
We should store `mDisplays` as `std::vector`, since the order of
hotplug events during boot matters in determining the primary display.

Bug: 209409863
Test: run vts -m VtsHalGraphicsComposerV2_2TargetTest

Signed-off-by: Kui1 Wu <wukui1@xiaomi.com>
Change-Id: I628ad593640f28fb8a916822a91ac2c578cc299d
2021-12-16 08:18:15 +00:00
Ady Abraham
91c9d1a821 composer: cleanup CommandWriterBase and CommandReaderBase
These classes are used by both the client and the service, which
makes them confusing. This CL splits the logic for the client
and the service.

Bug: 208856704
Test: VTS
Change-Id: I6fa89858afeee9113ea8c810261d734163a95ec9
2021-12-15 18:18:54 -08:00
Ram Indani
58ffd3d541 Merge "Set the thread pool count to 4 for vts3 tests. Thread priority is from https://source.corp.google.com/android/frameworks/native/services/surfaceflinger/main_surfaceflinger.cpp;rcl=e9cdd276a89d512137f22650da0c45ee4b28bd66;l=97" 2021-12-15 16:27:15 +00:00
Leon Scroggins
a97bfe621b Merge "Add DISPLAY_DECORATION to HWC3 HAL" 2021-12-14 18:03:53 +00:00
ramindani
3d18f92380 Store the GraphicBuffer allocated so that SP pointer is not deallocated when this function exists to verify values in other related fuctions.
Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 199413815
Change-Id: I7e44311cf7a11220f80f41cef503b7b82b443ece
2021-12-14 01:49:19 +00:00
Ady Abraham
a80531fdc0 composer3: fix documentation to match aidl style
Bug: 201008710
Test: N/A
Change-Id: Ie7030e4e0ccf817b8dfc6bf7f91fbd1bd4d18928
2021-12-13 23:27:39 +00:00
Ady Abraham
6679baf603 composer: add DisplayCapability::SUSPEND
Also remove the redundant APIs getDisplayBrightnessSupport
and getDozeSupport.

Bug: 209889459
Test: VTS
Change-Id: Id7e4da62fdcf65b279656a9f115e60b6145e8b5d
2021-12-13 23:27:12 +00:00
Ady Abraham
c26756d5ee composer: move LayerCommand to be part of DisplayCommand
This CL also includes a few miscellaneous changes:
 - Remove ..composer3.command namespace
   (so all commands are in composer3)
 - Minor documentation update
 - Minor name changes

Bug: 201008710
Test: VTS
Change-Id: I3fc24392d6c019c39e4d7df735abacc2c793c4f9
2021-12-13 23:09:53 +00:00
ramindani
beea10e8e6 Set the thread pool count to 4 for vts3 tests.
Thread priority is from
https://source.corp.google.com/android/frameworks/native/services/surfaceflinger/main_surfaceflinger.cpp;rcl=e9cdd276a89d512137f22650da0c45ee4b28bd66;l=97

Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 207005096
Change-Id: Ic37b454c4ae3990fd8cb38fcdd50747083b2528c
2021-12-13 15:14:36 +08:00
Alec Mouri
29d2a0f733 Add white point plumbing into command buffer
Bug: 200310158
Test: builds, boots
Change-Id: I67cadb441b24663346452850a86e3d9151868749
2021-12-09 13:29:34 -08:00
Ady Abraham
7d4d3dace1 Merge "Add Parcelable AidlComposer commands" 2021-12-08 05:03:16 +00:00
Ady Abraham
3192f3dfdb Add Parcelable AidlComposer commands
Change the command interface to use parcelables instead of FMQ.

Bug: 201008710
Test: VTS
Change-Id: Iac67330eb34a5bcf253580e8109a67bd90483d85
2021-12-08 00:19:29 +00:00
Leon Scroggins
c2bd02947a Merge "Add AIDL PixelFormat::R_8" 2021-12-07 15:13:20 +00:00
Leon Scroggins III
c0ae66a05e Add AIDL PixelFormat::R_8
Bug: 193170859
Bug: 209497983
Test: build and boot
Test: TODO (b/209458105)
Change-Id: I6f6b7f22e76609151a413ca6a6dbf55bd91911dd
2021-12-06 18:39:36 -05:00
Ram Indani
3944930291 Merge "Readback tests from VtsHalGraphicsComposerV2_2TargetTest VTS 2.2" 2021-12-06 21:13:12 +00:00
ramindani
b27f33b4b4 Readback tests from VtsHalGraphicsComposerV2_2TargetTest VTS 2.2
Tests are from https://source.corp.google.com/android/hardware/interfaces/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp;l=431

Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 202766745
Change-Id: I591a7ecfc8bb6ec5e9d764e93a9d43f91b23ea74
2021-12-06 16:57:06 +00:00
Leon Scroggins III
437dee048f Add DISPLAY_DECORATION to HWC3 HAL
Bug: 193170859
Test: TODO
Change-Id: I90543850d57323be485a0fa8562f4e965aed28ab
2021-12-06 10:00:03 -05:00
Ady Abraham
4aa4ead85d composer: vts: fix display type
display is 64bit and not 32bit

Test: build
Bug: 202766745
Change-Id: I0e0d53222b306fe303867a105868e85e072c0299
2021-12-03 16:07:54 -08:00
ramindani
bab8ba921f Readback tests from VTS 2.2
Tests are from https://source.corp.google.com/android/hardware/interfaces/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp;rcl=4796867049599ae1618d63cb93a38b269687164b;l=52

Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 202766745

Change-Id: I495819c168429873dc88decb20f398569c1a8128
2021-12-03 01:40:23 +00:00
ramindani
dcfe3a8b96 AIDL vts 2.1 command tests
Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 199413815
Change-Id: I4a49ae5e6110e45e96cd595e916a84d42470a93b
2021-12-02 17:07:12 +00:00
Ram Indani
8a2c44fa6c Merge "AIDL vts non reader writer 2.1 tests" 2021-12-02 16:48:55 +00:00
ramindani
2740baca70 AIDL vts non reader writer 2.1 tests
Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 199413815
Change-Id: Ib801b248c83111fafc2c239e1edecd859067c62e
2021-12-01 00:38:23 +00:00
ramindani
770d70876a AIDL vts 2.1 test differences in the existing tests.
Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 199413815
Change-Id: I4b3c6eadea9d17eabb9c06d098b654cd4d93267b
2021-11-30 21:50:01 +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
ramindani
a50a59e82d VTS 2.4 setActiveConfigWithConstraints_Delayed
and setActiveConfigWithConstraints_MissRefresh

Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 202053621
Change-Id: Ibdaa3377f7e30b466ffef8bd0c1cf09323800403
2021-11-22 17:21:14 +00:00
Ram Indani
8540a56f47 Merge "Tests SET_LAYER_PER_FRAME_METADATA and SetLayerColorTransform from VTS 2.3" 2021-11-22 16:52:04 +00:00
ramindani
7fec2c9316 Tests SET_LAYER_PER_FRAME_METADATA and SetLayerColorTransform from VTS 2.3
Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 202549950
Change-Id: Icceded3331dc59f50c8ce3234f7cfe12a76ff08a
2021-11-20 02:33:26 +00:00
ramindani
deb059e4c2 VtsHalGraphicsComposer3_TargetTest test fixes.
GraphicsComposerCallback Extend BnComposerCallback
 -> This will ensure that callback can be used for the binder.


Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 202053621

Change-Id: I739217cc40ede49601446306bd6ce0029a77cfba
2021-11-20 01:35:57 +00:00
ramindani
3335f7a4fe Migrate reader writer based tests for HAL 2.4
Test: atest VtsHalGraphicsComposer3_TargetTest, test are not run yet as we don't have the service yet.
BUG: 202446967
Change-Id: I5a9a807c8984cfc3db18440b6ee9ea2b43085324
2021-11-16 02:04:12 +00:00
Long Ling
abc390baae Merge "Fix comile error for pixel aidl hwc" 2021-11-12 04:39:26 +00:00
ramindani
c2b8d0879d Adds non reader/writer based HAL 2.2 tests for AIDL composer3
If service exists then we can proceed with test otherwise tests will be skipped.

Test: atest VtsHalGraphicsComposer3_TargetTest but tests don't just work yet. as we don't have service implementation.
BUG: 202053621
NOTE: Efforts to migrate reader/writer based tests will be done under b/202765481
Composition tests will be migrate under b/202766745

CHECK: https://googleplex-android-review.git.corp.google.com/c/platform/hardware/interfaces/+/16202961/4..6
GetClientTargetSupport_2_2 and GetClientTargetSupport_2_2BadDisplay are removed as per b/203093280

Change-Id: I7bea002072390b9e19bf9fe31de00087cf4d0bf3
2021-11-09 21:55:32 +00:00
TreeHugger Robot
d83f0e313d Merge "Link in libtonemap into composer VTS" 2021-11-09 17:55:04 +00:00
ramindani
592b651492 Adds non reader/writer based HAL 2.3 tests for AIDL composer3
If service exists then we can proceed with test otherwise tests will be skipped.

Test: atest VtsHalGraphicsComposer3_TargetTest but tests don't just work yet. as we don't have service implementation.
BUG: 202053621

CHECK: https://googleplex-android-review.git.corp.google.com/c/platform/hardware/interfaces/+/16019271/3..8

NOTE: Efforts to migrate reader/writer based tests will be done under b/202549950
Change-Id: I1a515a8ce53f4d314d517272a81a9a504a144eb2
2021-11-04 20:14:21 +00:00
Ram Indani
9aee712d79 Merge "Add invalid config const to the AIDL interface." 2021-11-04 18:44:23 +00:00
ramindani
0291f1111a Adds non reader/writer based HAL 2.4 tests for AIDL composer3
If service exists then we can proceed with test otherwise tests will be skipped.

Test: atest VtsHalGraphicsComposer3_TargetTest but tests don't just work yet. as we don't have service implementation.
BUG: 202053621

NOTE: Efforts to migrate reader/writer based tests will be done under b/202446967

CHECK: https://googleplex-android-review.git.corp.google.com/c/platform/hardware/interfaces/+/15987347/7..14

Change-Id: Ie7a81bbec463a471d9c88edf32cde6d86197991a
2021-11-04 16:47:33 +00:00
Ram Indani
6e822dfbef Add invalid config const to the AIDL interface.
Test: atest VtsHalGraphicsComposer3_TargetTest but tests don't just work yet. as we don't have service implementation.
BUG: 202053621
Change-Id: I96fc1f6bcb4ce4907342b3a73994f80b9347ea9f
2021-11-04 00:32:02 +00:00
ramindani
1cb794eb3d Populates the displays required for the tests.
Create composer callback for tests.

Test: atest VtsHalGraphicsComposer3_TargetTest, test are not run yet but
BUG: 202401906

Change-Id: I87396cdae7d083a2d2529617648fdd784e9097db
2021-11-01 23:40:48 +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
Ady Abraham
da95387a0a Merge changes I2b06ad79,I8b48188d
* changes:
  composer: add SKIP_VALIDATE to AIDL
  composer: remove getClientTargetSupport
2021-10-21 00:19:30 +00:00
Ady Abraham
2d43bb71b0 composer: dup handle before storing it
use dupToAidl to store handles in the command writer instead of
makeToAidl, to match the HIDL behaviour

Bug: 198190384
Test: build
Change-Id: Idb46de2182048d4fb3d6b598246c62e1969f629b
2021-10-20 23:04:08 +00:00
TreeHugger Robot
5a461fa66b Merge "composer: add CoGS team as OWNERS" 2021-10-20 22:15:06 +00:00
Treehugger Robot
af0806e4f5 Merge "Update OWNERS for VtsHalGraphicsComposer tests." am: cb0667c916 am: 83f6228bdf am: 2b799702ab am: d2eeeaabc2 am: 9d68d6be49
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1861820

Change-Id: Ica8fcb124b173ee79805d2d84352d6f1fea95880
2021-10-20 20:59:29 +00:00
Ady Abraham
b317b100e3 composer: add CoGS team as OWNERS
Change-Id: I861f2f9219bf82991efb0c2dc3db2073276012c0
2021-10-20 20:57:36 +00:00
Ady Abraham
6dde1bca6f Merge "Add command buffer support for AidlComposer" 2021-10-20 20:53:41 +00:00
Treehugger Robot
cb0667c916 Merge "Update OWNERS for VtsHalGraphicsComposer tests." 2021-10-20 19:28:03 +00:00
Ram Indani
941fbbb4e9 Merge "Fix the conditions for the tests based on comments on ag/15968818. Check EXPECT_TRUE with status ok and Error none for valid display. and EXPECT_FALSE with status ok. If service exists then we can proceed with test otherwise tests will be skipped." 2021-10-19 18:31:59 +00:00
Yiming Pan
cd9afdf0af Update OWNERS for VtsHalGraphicsComposer tests.
Test: Tree Hugger
Bug: 143903671
Change-Id: I228402a350ecccac92dea7c5facde60496ba3e6e
2021-10-18 17:28:00 -07:00
Ady Abraham
4e001df750 composer: add SKIP_VALIDATE to AIDL
HWC2_CAPABILITY_SKIP_VALIDATE was never defined for HIDL,
and instead there was a hack to just pass the value to the client
(see commit 6a05e9113a).

Test: build
Bug: 198690211
Change-Id: I2b06ad792237eb99e4dfe6b5c1ef808d5de45bd7
2021-10-18 16:45:23 -07:00
Ady Abraham
832258e931 composer: remove getClientTargetSupport
getClientTargetSupport is not used anyware

Bug: 203093280
Test: build
Change-Id: I8b48188d34c1b0c3eed02e1e5d94ff5be3413ae2
2021-10-18 16:45:20 -07:00
Ady Abraham
d06f050dca Add command buffer support for AidlComposer
Bug: 198190384
Test: build

Change-Id: Ia28cf992b0ab06099a9ea3f871925839e92e8dc9
2021-10-18 16:44:33 -07:00
Treehugger Robot
1a0a5129d3 Merge "Revert "VTS: Test that configs in a group differ only by vsync period"" am: b350c7cf49 am: 3741e92674 am: 58e3e65a63 am: 4e320b87f6 am: a50225b4a9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1830034

Change-Id: I8db3a3c772cecde5143d521b864fb37551b8cce1
2021-10-18 22:53:20 +00:00
Treehugger Robot
b350c7cf49 Merge "Revert "VTS: Test that configs in a group differ only by vsync period"" 2021-10-18 21:39:37 +00:00
Treehugger Robot
184c1b546c Merge "Revert "Clarify the ComposerClient comment for CONFIG_GROUP"" 2021-10-18 20:56:12 +00:00
Snild Dolkow
0e9328e213 Revert "Clarify the ComposerClient comment for CONFIG_GROUP"
This reverts commit 37c5495c52.

This "clarification" was in fact a change of the HAL interface,
introducing a new requirement which was not present in earlier
Android releases. There are devices on the market that switch
seamlessly between configs that differ in resolution and DPI,
and therefore have those configs in a config group.

Bug: 200184776
Merged-In: I5bba1c6532f5f46da874385164a0bc0cc0435225
Change-Id: I5bba1c6532f5f46da874385164a0bc0cc0435225
2021-10-18 20:55:31 +00:00
Snild Dolkow
bf484a6adb Revert "VTS: Test that configs in a group differ only by vsync period"
This reverts commit 6f36dd6e31.

Differing only by vsync period was not a requirement on Android R, and
it shouldn't be added after-the-fact to an existing HAL version.

There are devices on the market that switch seamlessly between configs
that differ in resolution/dpi, and therefore have those configs in a
common group.

Bug: 200184776
Change-Id: Id0bfc67e55d5139fddb2b359cabafd9281c33734
2021-10-18 20:31:52 +00:00
TreeHugger Robot
6b371e2b41 Merge "Revert "Clarify the ComposerClient comment for CONFIG_GROUP"" 2021-10-18 20:29:10 +00:00
Treehugger Robot
3eccaa7d23 Merge "Backfill OWNERS for VtsHalGraphicsMapper tests." am: cd6ab41533 am: eeaedb225d am: fedf81818a am: 5db4d85b44 am: 23e8d9ecf9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1858914

Change-Id: If6b8aab0f77ffa0d4fcd1a99f6431b8a053a19d1
2021-10-18 18:56:32 +00:00
Alec Mouri
9f803e5a5b Merge "Add sdr white point information to composer3" 2021-10-16 04:36:04 +00:00
Sally Qi
b35e2ee931 Merge "Revert "Revert "Fix vts cases due to function change for async r..."" 2021-10-15 17:52:24 +00:00
Snild Dolkow
5cd6212fee Revert "Clarify the ComposerClient comment for CONFIG_GROUP"
This reverts commit 37c5495c52.

This "clarification" was in fact a change of the HAL interface,
introducing a new requirement which was not present in earlier
Android releases. There are devices on the market that switch
seamlessly between configs that differ in resolution and DPI,
and therefore have those configs in a config group.

Bug: 200184776
Test: m
Change-Id: I5bba1c6532f5f46da874385164a0bc0cc0435225
2021-10-15 13:45:33 +02:00
Yiming Pan
af359f3acf Backfill OWNERS for VtsHalGraphicsMapper tests.
Done for the following tests:
VtsHalGraphicsMapperV2_0TargetTest
VtsHalGraphicsMapperV2_1TargetTest
VtsHalGraphicsMapperV3_0TargetTest
VtsHalGraphicsMapperV4_0TargetTest

Deleted the OWNERS file I created earlier to comply to your team's
convention.

Test: Tree Hugger
Bug: 143903671
Change-Id: I07790171fc1a42da37a43f590d8c5c2876ad1bfe
2021-10-14 17:45:53 -07:00
ramindani
5f696940c9 Fix the conditions for the tests based on comments on ag/15968818.
Check EXPECT_TRUE with status ok and Error none for valid display. and EXPECT_FALSE with status ok.
If service exists then we can proceed with test otherwise tests will be skipped.

Test: atest VtsHalGraphicsComposer3_TargetTest but tests don't just work yet. as we don't have service implementation.
BUG: 202053621
Change-Id: Iff8f4ca1e102ad8333ca63b0722b1fbd26414d06
2021-10-14 19:04:43 +00: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
Alec Mouri
e77193b7b9 Merge "Add gralloc VTS for SMPTE 2094-10 metadata" 2021-10-13 00:24:46 +00:00
Alec Mouri
10bccc3c1f Add sdr white point information to composer3
* Add layer-level SDR white point. When there are mixed HDR/SDR layers
on the display, HDR layers should remain at display brightness, or
whatever the HDR standard is (e.g., keep HLG content at 1000 nits), while
SDR layers should be "dimmed" to the appropriate perceptual brightness.
* Add SDR white point to the client composited client target buffer.
When there are mixed HDR/SDR layers in client compostion, HWC must tell
SurfaceFlinger the target white point of the client target buffer so
that SurfaceFlinger-applied dimming may be atomically applied as a
brightness mode change.

Bug: 200310158
Test: builds

Change-Id: Ifbfe3125ede1a4de04978c6e644a5c911c33d3b6
2021-10-12 16:03:19 -07:00
Vladimir Marko
dcc4f03906 Merge "Revert "Fix vts cases due to function change for async render en..."" 2021-10-12 17:16:48 +00:00
Vladimir Marko
33c0b8d83e Revert "Fix vts cases due to function change for async render en..."
Revert "Second Patch for async RenderEngine"

Revert "Fix vender implementation due to second patch of async R..."

Revert submission 15644535-asyncRenderEngineV2

Reason for revert: Broke multiple tests
Reverted Changes:
I772122750:Fix vts cases due to function change for async ren...
I615f2927d:Second Patch for async RenderEngine
I3f47b8b67:Fix vender implementation due to second patch of a...

Bug: 202803359
Bug: 202808760
Change-Id: I0313622b2d879ca3a3e63ff52458b51100748a29
2021-10-12 17:15:09 +00:00
Sally Qi
7464ef6206 Merge "Fix vts cases due to function change for async render engine." 2021-10-12 04:52:20 +00:00
Marin Shalamanov
051c72e1ff Merge "Update the Composer HAL docs for setContentType" 2021-10-11 09:48:20 +00:00
Alec Mouri
7015054851 Add gralloc VTS for SMPTE 2094-10 metadata
Bug: 200309502
Test: VtsHalGraphicsMapperV4_0TargetTest
Change-Id: If1f3d99b70226f609f6cdbd05a790de0fb05d006
2021-10-07 12:47:17 -07:00
ramindani
a9780260ae Add two tests for Stable AIDL composer3 as a start of tests.
If service exists then we can proceed with test otherwise we skip tests

This should help us write all the tests until we have the service implementation.

Test: atest VtsHalGraphicsComposer3_TargetTest Tests don't just work yet, we don't have service implemented yet.
BUG: 202053621
Change-Id: Ia9506dada0f1b5da446d6e2086aa4534c60d5565
2021-10-07 16:33:24 +00:00
Marin Shalamanov
b00e11ff6f Update the Composer HAL docs for setContentType
setContentType can be called even if it's not supported.
On some devices this surves as a signal to disable on-device
post processing in order to reduce latency.

Bug: 202007307
Test: n/a
Change-Id: I9888d48979cd2442b54054730c78cf7b4ed6aab4
2021-10-07 18:09:15 +02:00
Ram Indani
9119a2b91c Merge "Setup Stable AIDL composer VTS tests." 2021-10-06 22:57:43 +00:00
TreeHugger Robot
2085590af8 Merge "Add HDR-related revisions to graphics types" 2021-10-06 22:09:54 +00:00
ramindani
d32ae8e752 Setup Stable AIDL composer VTS tests.
This is a setup on which I can start writing tests by creating composer client first.

Test: Verified with a placeholder test that we can execute tests
NOTE: Tests don't work as there is no service, so empty tests should be skipped in presubmits automatically.
BUG: 201797934
Change-Id: I1b6aca6c497bf60c5a417533508e30100192625a
2021-10-06 19:09:26 +00:00
Sally Qi
03f344fe3b Fix vts cases due to function change for async render engine.
Bug: 180657548
Test: this
Change-Id: I772122750c224b5439603554acaccd5c29f58530
2021-10-04 21:35:42 -07:00
Bob Badour
e613d20f91 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  graphics/composer/aidl/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I985e4e04ec39538b992a692041ec491ff1ea8ede
2021-10-01 13:16:29 -07:00
Alec Mouri
70040729ee Add HDR-related revisions to graphics types
* Add standard metadata support for data described by the SMPTE 2094-10
standard. This corresponds to Dolby Vision support, and as such the
metadata will use an opaque format, similar to existing support for the
SMPTE 2094-40 standard.
* Relax P010 definition so that arbitrary semiplanar layouts are
supported. For devices implementing Gralloc 4, sufficient information is
exposed from PlaneLayout that clients are able to interpret the buffer
content correctly without the additional layout restrictions.
Furthermore, this brings the gralloc definition in-line with the relaxed
definition in android.media.ImageFormat.

Bug: 196617266
Bug: 200309502
Test: builds
Change-Id: I23774c81488292324de06dd4e3a8341421432a57
2021-09-29 15:13:04 -07:00
Ady Abraham
3ae4dec2b3 Merge "Add composer3 AIDL" 2021-09-28 17:06:36 +00:00
Ady Abraham
fd549c90db Add composer3 AIDL
This is the initial AIDL interface based on the HIDL interface
android.hardware.graphics.composer@2.4.

Test: Build
Bug: 198690211
Change-Id: I385ea8084f9a33c2b6dd79bb9a376692fec4a399
2021-09-23 14:33:27 -07:00
Treehugger Robot
de585047e4 Merge "Add OWNERS for VTS module VtsHalGraphicsMapperV2_0TargetTest" am: b430616db8 am: 6a05c72c88 am: da9e0b42d9 am: 36373bf198 am: 8c58d98d3e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793849

Change-Id: I50928251c9f4e455224b00bd336522e31bc17617
2021-09-15 00:28:56 +00:00
Treehugger Robot
6a05c72c88 Merge "Add OWNERS for VTS module VtsHalGraphicsMapperV2_0TargetTest" am: b430616db8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793849

Change-Id: I2aebbe027325e03fd4c7116c01ea35e17cfb35d9
2021-09-14 23:29:40 +00:00
Treehugger Robot
b430616db8 Merge "Add OWNERS for VTS module VtsHalGraphicsMapperV2_0TargetTest" 2021-09-14 22:15:53 +00:00
Treehugger Robot
55534861ae Merge "Add OWNERS for VTS module VtsHalGraphicsComposerV2_1TargetTest" am: 0940838b4e am: 39c17d609a am: d435a3dc27 am: 1d811fc802 am: 80ae0d39a8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793848

Change-Id: Iade51174708fd8e5f1d2ce151724d18f3ec6dda8
2021-09-10 01:03:40 +00:00
Treehugger Robot
ce996aa1c3 Merge "Add OWNERS for VTS module VtsHalGraphicsMapperV2_1Target" am: b35b78f7ac am: b89aaa92b9 am: 077673cd38 am: 8aaf384aea am: 8a5718cbd5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793850

Change-Id: Iccb7d0f942fa351d66007d32123fb54df950798c
2021-09-10 01:03:27 +00:00
Treehugger Robot
39c17d609a Merge "Add OWNERS for VTS module VtsHalGraphicsComposerV2_1TargetTest" am: 0940838b4e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793848

Change-Id: I7185e2f53d63750a9e6c8d2e33d2ac3b2f2b43da
2021-09-09 23:18:58 +00:00
Treehugger Robot
b89aaa92b9 Merge "Add OWNERS for VTS module VtsHalGraphicsMapperV2_1Target" am: b35b78f7ac
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793850

Change-Id: Idda97bda2ccf3e4c3deff2a9ef8fe0f9a5d6ac9b
2021-09-09 23:18:50 +00:00
Treehugger Robot
0940838b4e Merge "Add OWNERS for VTS module VtsHalGraphicsComposerV2_1TargetTest" 2021-09-09 22:52:25 +00:00
Treehugger Robot
b35b78f7ac Merge "Add OWNERS for VTS module VtsHalGraphicsMapperV2_1Target" 2021-09-09 22:52:15 +00:00
Steven Moreland
1bae5dff8d .graphics.common: use versions for imports am: b196a659d2 am: 0b1806955f am: ef1511a929 am: dc604314d4 am: cc1743ef26
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1814145

Change-Id: I2e117fe80ef6ba84a2acc3ac8d770ca138aff5b1
2021-08-31 18:12:23 +00:00
Steven Moreland
0b1806955f .graphics.common: use versions for imports am: b196a659d2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1814145

Change-Id: If449bda3ddbde40ce4920a4687115f59e6529231
2021-08-31 17:09:35 +00:00
Steven Moreland
b196a659d2 .graphics.common: use versions for imports
This makes sure that when developers add a new version of an interface,
or when interfaces are being frozen, the runtime/buildtime situation of
clients depending on those interfaces remains the same. This is required
for AIDL to continue working at scale.

Bug: 188871598
Test: build
Change-Id: I5d85ed0f8d5cbeb0ec20659def492bc97787d9a9
2021-08-30 17:56:06 -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
Yiming Pan
521c56b62a Add OWNERS for VTS module VtsHalGraphicsMapperV2_1Target
Each VTS module is required to have OWNERS file. The ownership is based on
go/vts-owners. For more information about ownership policy, please visit
go/xts-owners-policy.

Test: Tree Hugger
Bug: 143903671
Change-Id: I871c2ca756593107e75a1265e351644062a3ac5d
2021-08-11 16:39:52 -07:00
Yiming Pan
6022ba83d4 Add OWNERS for VTS module VtsHalGraphicsMapperV2_0TargetTest
Each VTS module is required to have OWNERS file. The ownership is based on
go/vts-owners. For more information about ownership policy, please visit
go/xts-owners-policy.

Test: Tree Hugger
Bug: 143903671
Change-Id: I6e760696cf6e4e5785ddec4ff8c74c12005ecbae
2021-08-11 16:39:46 -07:00
Yiming Pan
bbb7b0aa69 Add OWNERS for VTS module VtsHalGraphicsComposerV2_1TargetTest
Each VTS module is required to have OWNERS file. The ownership is based on
go/vts-owners. For more information about ownership policy, please visit
go/xts-owners-policy.

Test: Tree Hugger
Bug: 143903671
Change-Id: I6647af3a0af6cb707904a454eef78c6c509035ec
2021-08-11 16:39:37 -07:00
Marin Shalamanov
7a0a69af4c Merge "Increase timeout for VtsHalGraphicsComposerV2_4TargetTest" into sc-dev am: b2239ad43f am: 5bdea90882
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15503010

Change-Id: I925c33163670e95d62fa7267d96e55ee4831d444
2021-08-10 16:02:49 +00:00
Marin Shalamanov
b0fefa2d97 Merge "Increase timeout for VtsHalGraphicsComposerV2_4TargetTest" into sc-dev am: b2239ad43f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15503010

Change-Id: Ifa71accba7ecf2ab15980227a4413831cfceb187
2021-08-10 15:44:56 +00:00
Marin Shalamanov
e7a2d287b2 Increase timeout for VtsHalGraphicsComposerV2_4TargetTest
The current timout of 5 mins is not enough for
setActiveConfigWithConstraints to complete on devices
which have ~30 display modes and which can't do seamless
switching. The test needs 8 mins to complete locally --
increasing the timeout to 15 to have some margin.

Bug: 188686850
Test: atest VtsHalGraphicsComposerV2_4TargetTest
Change-Id: I07cf1825c23e2467852d5cd93436eb9dee23b408
2021-08-09 17:57:33 +02:00
Jiyong Park
04cd025c7c Merge "Remove ndk_platform backend. Use the ndk backend." am: 2346a4c6b9 am: 4ef9aa49dc am: 48131c0ace am: 08fcb12dd7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1778908

Change-Id: Ib3539a8eaded000ddc6f77212e49030e3d071afc
2021-07-28 13:05:10 +00:00
Jiyong Park
48131c0ace Merge "Remove ndk_platform backend. Use the ndk backend." am: 2346a4c6b9 am: 4ef9aa49dc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1778908

Change-Id: Ib35b7b0ddc0bebd0714d290b1ac2fab8d5a1893e
2021-07-28 12:39:05 +00:00
Jiyong Park
27f77fefd7 Remove ndk_platform backend. Use the ndk backend.
The ndk_platform backend will soon be deprecated because the ndk backend
can serve the same purpose. This is to eliminate the confusion about
having two variants (ndk and ndk_platform) for the same 'ndk' backend.

Bug: 161456198
Test: m
Change-Id: Ibe8beeaf0d1b33968fb782f1f70c17ae9e9bf871
2021-07-27 14:44:47 +09:00
Marin Shalamanov
1d26bb6a29 Merge "VTS: Validate that getDisplayIdentificationData returns EDID" into sc-dev am: 5c6c68ab0b am: 00edac9ee9
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15080630

Change-Id: Ib5886564ba98b2213992b9761e07b5484bb8511d
2021-07-23 10:41:58 +00:00
Marin Shalamanov
056def9ff0 Merge "VTS: Validate that getDisplayIdentificationData returns EDID" into sc-dev am: 5c6c68ab0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15080630

Change-Id: I5680c2be100864071f4013b90eee5619befb2424
2021-07-23 10:24:31 +00:00
Marin Shalamanov
5c6c68ab0b Merge "VTS: Validate that getDisplayIdentificationData returns EDID" into sc-dev 2021-07-23 10:15:17 +00:00
Sally Qi
a5d54ffeaa Merge "Fix vts gfx readback test issue because clearRegion was removed in I11f369d26e080ba49c7108957f8cf44c85146021." 2021-07-12 22:31:04 +00:00
Alec Mouri
06b9fb5e28 Merge "Clear composition changes when a color mode is not supported" into sc-dev am: f569528b19 am: 8ae996d084
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15244526

Change-Id: If3d38454cef2f87fca51b03ece36a1231aff8747
2021-07-09 21:39:13 +00:00
Alec Mouri
981a3c1a66 Merge "Clear composition changes when a color mode is not supported" into sc-dev am: f569528b19
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15244526

Change-Id: Ia3186d6d30fcaab371cee4adba50108a61fff515
2021-07-09 21:29:39 +00:00
Alec Mouri
b1bd1e8a32 Clear composition changes when a color mode is not supported
Otherwise this may cause a test to spuriously fail during teardown.

Bug: 184726169
Test: VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I569680a0fe6c866199ba0711e8cc263b9b3efd58
2021-07-09 11:15:18 -07:00
Sally Qi
ab4bc8d0d0 Fix vts gfx readback test issue because clearRegion was removed in
I11f369d26e080ba49c7108957f8cf44c85146021.

Bug: 181073175
Test: VtsHalGraphicsComposerV2_2TargetTest passed
Change-Id: Ic50b968f2d2334a016d0e83a66e43e89e6d2ad80
2021-07-09 00:18:56 +00:00
Marin Shalamanov
d65b354dee VTS: Validate that getDisplayIdentificationData returns EDID
Accroding to the documentation getDisplayIdentificationData
"data is the EDID 1.3 blob identifying the display".

This CL runs a basic validation that the returned data is
an EDID.

Test: atest VtsHalGraphicsComposerV2_3TargetTest
Bug: 191851265
Change-Id: I7604f3dc68095612d79bb04243918d6348de6c89
2021-07-06 13:52:04 +02:00
ramindani
872cc0af1a Add VTS test for YCbCr_P010 to denote that YCbCr_P010 is supported in Gralloc
BUG: 181069130

Test: atest VtsHalGraphicsMapperV3_0TargetTest
Change-Id: I43737dcbb530c0c4018b9609434eef38d8daa887
2021-06-30 16:19:11 +00:00
Ram Indani
6af4f98eec Merge "Add test in VTS MapperV4 for YCbCr_P010" 2021-06-24 16:52:23 +00:00
Treehugger Robot
555c368ddb Merge "Replace writepid with task_profiles command for cgroup migration" am: a43f14bdac am: 7151796908
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1740279

Change-Id: I8c9ebb5de59a2b8a87c8045cfc8c64b71eac0f10
2021-06-23 23:09:57 +00:00
ramindani
882c00f47d Add test in VTS MapperV4 for YCbCr_P010
Fixed comments.

Test: atest VtsHalGraphicsMapperV4_0TargetTest
BUG=181069130
Change-Id: I7c4f8edc20e8772c4a393b03e934868a0b963b2b

Change-Id: Idba57d496051f6a4f92748267e4ae4b13f8f98fb
2021-06-23 19:42:16 +00:00
Suren Baghdasaryan
dd50b2f45d Replace writepid with task_profiles command for cgroup migration
writepid command usage to join a cgroup has been deprecated in favor
of a more flexible approach using task_profiles. This way cgroup path
is not hardcoded and cgroup changes can be easily made. Replace
writepid with task_profiles command to migrate between cgroups.

Bug: 191283136
Test: build and boot
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I249ecc45a001a69d73b06b77154f9b6e5f9964d9
2021-06-23 18:43:27 +00: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
Marin Shalamanov
f876a7d123 Update OWNERS for composer/2.1/vts
Update the OWNERS file to match the respective files
from 2.2, 2.3 and 2.4.

Bug: 188686850
Test: n/a
Change-Id: I0ff9923695813da3dbec1aa94fe1a2bd988e521e
2021-06-16 12:46:24 +02:00
Ady Abraham
8bd3c2f00f composer: 2.4: vts: do not try to delay a config change outside a group
When switching to a new config, we can set the desiredTimeNanos to
be in the future only for configs within the same config groups.

Bug: 190250110
Test: atest VtsHalGraphicsComposerV2_4TargetTest
Change-Id: I5e292b656eccf6e90c06e08c6eb202d689b6f026
2021-06-08 17:03:20 -07:00
Jiyong Park
72b6359859 Freeze AIDL APIs for SC
Ignore-AOSP-First: part of SC finalization

Bug: 188713899
Test: m
Change-Id: Iee18cd05954dc8ea08cc4f985499a70977d1af4f
2021-05-25 10:13:26 +09:00
Jooyung Han
2af836b6e9 Merge changes from topic "fix-aidl-warnings" am: a886a5c4be am: 5235704ac4 am: bf1ec6e83e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1688165

Change-Id: I2eedb65bacef6075d5cf825749915262c25f4727
2021-04-27 23:49:08 +00:00
Jooyung Han
695ef7acfe aidl: Set explicit defaults to enum-type fields
Fixes: 179853398
Test: mma in hardware/interfaces/graphics
Change-Id: I6f93bca4ba3c8d538765fc9a811b9050c6142cc3
2021-04-27 12:17:39 +09:00
Ady Abraham
bd6647b45c composer: VtsDisplay::setDimensions shouldn't be const am: 2fff170562 am: e8bc48b777 am: 8ae4e17e41
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1686815

Change-Id: I2673c622eeda517366515369a3f35235df7b1d6c
2021-04-26 22:08:58 +00:00
Ady Abraham
2fff170562 composer: VtsDisplay::setDimensions shouldn't be const
Fix the usage of const attribute in VtsDisplay

Test: run composer 2.4 VTS
Bug: 185195256
Change-Id: I616ea044f46bc080ad0e82753b5031d9a38369f3
2021-04-26 12:00:06 -07:00
Ady Abraham
c801385495 composer: update VtsDisplay dimensions
When the active config changes, the display dimension might change
as well, so we need to update it to match the active config.

Test: run composer 2.4 VTS
Bug: 185195256
Change-Id: Ie2671e61498d2501901885b2a9986ee1974bd641
Merged-In: Ie2671e61498d2501901885b2a9986ee1974bd641
2021-04-22 18:56:46 +00:00
Ady Abraham
bd7ea386c9 composer: update VtsDisplay dimensions
When the active config changes, the display dimension might change
as well, so we need to update it to match the active config.

Test: run composer 2.4 VTS
Bug: 185195256
Change-Id: Ie2671e61498d2501901885b2a9986ee1974bd641
2021-04-22 00:06:32 +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
Michael Butler
8c4f0fcfc0 Improve the structure of NNAPI AIDL Memory
Prior to this change, the NN AIDL HAL created a Memory struct analogous
to hidl_memory, consisting of a name, size, and native handle. However,
this Memory struct is not very structured, and requires both the client
and server to agree on how the data should be interpreted.

This CL tightens the structure of the Memory representation by
introducing Ashmem and MappableFile structs to android.hardware.common
in order to hold specific file descriptors representing memory regions.
Further, this CL redefines android.hardwre.neuralnetworks's Memory
object as a union of the Ashmem, MappableFile, and (existing)
HardwareBuffer memory types.

This change also adds "com.android.neuralnetworks" to the graphics
AIDL HAL's apex_available build rule.

Bug: 183118727
Test: mma
Change-Id: I32322df676b83597c9e95f13662c322a6a80accc
Merged-In: I32322df676b83597c9e95f13662c322a6a80accc
(cherry picked from commit 1158c80ff6)
2021-04-09 02:09:16 +00:00
Michael Butler
dd53d04d8c Improve the structure of NNAPI AIDL Memory
Prior to this change, the NN AIDL HAL created a Memory struct analogous
to hidl_memory, consisting of a name, size, and native handle. However,
this Memory struct is not very structured, and requires both the client
and server to agree on how the data should be interpreted.

This CL tightens the structure of the Memory representation by
introducing Ashmem and MappableFile structs to android.hardware.common
in order to hold specific file descriptors representing memory regions.
Further, this CL redefines android.hardwre.neuralnetworks's Memory
object as a union of the Ashmem, MappableFile, and (existing)
HardwareBuffer memory types.

This change also adds "com.android.neuralnetworks" to the graphics
AIDL HAL's apex_available build rule.

Bug: 183118727
Test: mma
Change-Id: I32322df676b83597c9e95f13662c322a6a80accc
Merged-In: I32322df676b83597c9e95f13662c322a6a80accc
(cherry picked from commit 1158c80ff6)
2021-04-07 12:54:18 -07:00
Marin Shalamanov
ab9bae0dc4 Merge "ComposerClient 2.4: Clean cache on hotplug" into sc-dev 2021-04-01 10:12:46 +00: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
Marin Shalamanov
944b68180b ComposerClient 2.4: Clean 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.

This is already implemented for ComposerClient 2.1-2.3. In
this CL only the behavior for ComposerClient 2.4 is changed.

Test: manually flash a device
Bug: 178785393
Change-Id: I6aa1243d61676c0a3d42cb7aecf19e6f8802cb1a
2021-03-15 17:12:01 +01:00
Alec Mouri
c1dfee14d6 Merge "Add render target bit to output buffer for readback vts" into sc-dev 2021-02-25 23:02:57 +00:00
Alec Mouri
43db707407 Add render target bit to output buffer for readback vts
RenderEngine requires the gpu target bit on its output buffers, since
it is a GPU implementation which...uses the GPU.

Bug: 180650640
Test: atest VtsHalGraphicsComposerV2_2TargetTest
Change-Id: Ie99af44dc1b8804026b889f8342362839a43c945
2021-02-24 23:40:21 +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
Treehugger Robot
0842efd583 Merge "composer: increase timeout for VTS" am: 11cee080d7 am: fbc1f2282c am: 8c2c72d5ce
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1597162

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib476659d88a618ada17108649ab4421325470f5d
2021-02-23 10:28:26 +00:00
Treehugger Robot
11cee080d7 Merge "composer: increase timeout for VTS" 2021-02-23 06:02:44 +00:00
Bob Badour
564733607c resolve merge conflicts of 5c715dd65b to sc-dev
Change-Id: Ie3809f388a44d735303118366331679aa63a5944
2021-02-22 15:58:32 +00:00
Bob Badour
b224b363de [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/can/1.0/default/libnetdevice/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/face/1.0/Android.bp
  biometrics/face/1.0/default/Android.bp
  biometrics/face/1.0/vts/functional/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/vts/functional/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/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/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
  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/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/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/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
  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/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
  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
  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/default/Android.mk
  wifi/1.4/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/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

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: I602b072f77ff41e9eb8d3c36b6b5315d63664006
Merged-in: I602b072f77ff41e9eb8d3c36b6b5315d63664006
2021-02-21 20:36:55 -08:00
Ady Abraham
5c9725dbe9 composer: increase timeout for VTS
Some devices expose more then a few display configurations which
requires a longer timeout for the VTS to complete.

Bug: 180690432
Test: run vts VtsHalGraphicsComposerV2_4TargetTest
Change-Id: I4bef6354109d9244997c4b70e8c66b176ac90b10
2021-02-19 16:47:24 -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
Jeongik Cha
1674c1354e Specify version for aidl_interface explicitly
Bug: 150578172
Test: m
Change-Id: Ie7605c203c0f0eaf2c40f1e64ea45634b3aa54a5
Merged-In: I141de8ed6958fe42f727a0fa41473de4c1fb38de
2021-01-28 15:14:10 +00:00
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