Commit graph

503 commits

Author SHA1 Message Date
Elliott Hughes
f62cfc207f Remove -Wno-user-defined-warnings. am: 18ea3d2d5e
am: 25769c2d3d

Change-Id: I4d646381b0ba63f00d3259b20b02df0d34c68cd6
2019-06-07 12:33:28 -07:00
Elliott Hughes
18ea3d2d5e Remove -Wno-user-defined-warnings.
Doesn't seem to be necessary.

Bug: http://b/134716967
Test: treehugger
Change-Id: I9617cf82c816ef072005f7baf2fceee9628313f5
2019-06-07 08:46:26 -07:00
Peiyong Lin
ccc1805cb5 Merge "Put composer 2.3 in the right cpuset." into qt-dev
am: 862a9fdf6e

Change-Id: I1171130711329874233540dfd7d394d1de7d2a66
2019-05-13 12:51:42 -07:00
Peiyong Lin
a83af2b6fd Put composer 2.3 in the right cpuset.
the composer HAL should be in the system-background cpuset, but hwc 2.3 is not
in any cpuset. This patch restricts it to system-background.

BUG: 132559090
Test: Build, flash and boot.
Change-Id: I1739a6c049e195f6cc79b81fcba7a6fcb55b546a
2019-05-13 09:34:10 -07:00
Peiyong Lin
2007f2d931 Merge "Return display capability if getDisplayBrightnessSupport is not registered." into qt-dev
am: 248f72a9a0

Change-Id: I105e29926e146e4d7e9c6924fcb4588e57e1400b
2019-05-08 11:28:09 -07:00
Peiyong Lin
248f72a9a0 Merge "Return display capability if getDisplayBrightnessSupport is not registered." into qt-dev 2019-05-08 17:59:55 +00:00
Valerie Hau
18af76ef9f Merge "Fix getDisplayCapabilitiesBasic VTS test" into qt-dev
am: 767a57fb19

Change-Id: I9477c6015409156e1d184ae70c15630e77f44025
2019-05-07 21:27:41 -07:00
TreeHugger Robot
767a57fb19 Merge "Fix getDisplayCapabilitiesBasic VTS test" into qt-dev 2019-05-08 03:17:43 +00:00
Valerie Hau
0db2322402 Merge "Fix setLayerCursorPosition test" into qt-dev
am: 34f36713bf

Change-Id: Ic4ebed51afcd11f766f82fa51658c0f871bca65a
2019-05-07 16:27:50 -07:00
TreeHugger Robot
34f36713bf Merge "Fix setLayerCursorPosition test" into qt-dev 2019-05-07 23:07:29 +00:00
Valerie Hau
66ea37f739 Merge "Fix setLayerCursorPosition Test" into qt-dev
am: 3da7baee06

Change-Id: I3a42c2d84d1cb76252ea808b6341b457d2f693c2
2019-05-07 13:11:46 -07:00
Valerie Hau
185d7a4b1f Fix setLayerCursorPosition test
Set composition type to Cursor

Bug: 132057336, 131181758
Test: VtsHalGraphicsComposerV2_1TargetTest
Change-Id: I03ae799358abcdbd0a1c39a13d30d76aa7712004
2019-05-07 12:35:49 -07:00
Valerie Hau
3da7baee06 Merge "Fix setLayerCursorPosition Test" into qt-dev 2019-05-07 19:10:24 +00:00
Valerie Hau
804857176a Fix getDisplayCapabilitiesBasic VTS test
Old test checked error code when calling getBrightnessSupport in the
getDisplayCapabilitiesBasic test.  However, it is possible that the
function is not implemented (UNSUPPORTED).  We want to return normally
and use the returned supported boolean to check this instead.

Bug: 132043561, 132056857
Test: VtsHalGraphicsComposerV2_3TargetTest
Change-Id: I94f8f39ba9129c4a8d939a5385538db3489c46b9
2019-05-07 11:52:27 -07:00
Valerie Hau
efe7621dac Fix setLayerCursorPosition Test
Bug: 131181758
Test: build, boot, VtsHalGraphicsComposerV2_1TargetTest
Change-Id: I70f4f8f64c16ce45eba70c2e47d3fa2913034eba
2019-05-07 08:06:05 -07:00
Valerie Hau
86a6f6e805 Merge "Call into validateBufferSize and getTransportSize" into qt-dev
am: 85b557fd1a

Change-Id: I367da83cd2e912d623698e28a6bda09a931aa33a
2019-05-06 09:29:05 -07:00
Peiyong Lin
0686afa15a Return display capability if getDisplayBrightnessSupport is not registered.
If getDisplayBrightnessSupport is not registered, there are two possibilities,
one is it's not supported at all, the other is that the support is returned in
getDisplayCapabilities. And thus we need to check getDisplayCapabilities, and
we return UNSUPPORTED always in this case. This patch also allows
getPerFrameMetadataKeys to return UNSUPPORTED on non-HDR capable devices.

BUG: 131595097
Test: Build, boot.
Change-Id: Ied302b1ac702dd94e039f1081d5420395c1bfbf4
2019-05-01 16:58:13 -07:00
Valerie Hau
8e3fe149e1 Call into validateBufferSize and getTransportSize
After adding validateBufferSize and getTransportSize,
call into these functions if they have been implemented

This reverts commit 5e01b1411a.
Reason for revert: Merge once targets w/ gralloc0 dependency have been updated

Bug: 130669566
Test: build, boot
Change-Id: Ic20a62c5e73f517028a358548442d59c9cf91cdf
2019-04-24 21:46:01 +00:00
Valerie Hau
c04e71b89c Merge "Revert "Call into validateBufferSize and getTransportSize"" into qt-dev
am: a7904cd342

Change-Id: Ic407f3e433505dd9b6eb1024fd85e47e508b9a42
2019-04-23 16:24:51 -07:00
Valerie Hau
5e01b1411a Revert "Call into validateBufferSize and getTransportSize"
This reverts commit 69ee26a389.

Reason for revert: Break in Elfin

Bug: 130669566
Change-Id: Ia44fd087981770676a6887aa390c674c2855f4cb
2019-04-23 22:54:59 +00:00
Valerie Hau
95072f8c52 Merge "Call into validateBufferSize and getTransportSize" into qt-dev
am: 492399e5cd

Change-Id: I1d44634b47964a8ecb741b7e60c48de9025d2b9b
2019-04-23 15:22:18 -07:00
Valerie Hau
69ee26a389 Call into validateBufferSize and getTransportSize
After adding validateBufferSize and getTransportSize,
call into these functions if they have been implemented

Bug: 130669566
Test: build, boot
Change-Id: I445cb6122107a514bc0bf433a9e140dbe3122573
2019-04-22 17:50:02 -07:00
Steven Moreland
99712c08cc Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I53e5bf67a0d314e1b10c0ba0c7172a7af358ddcc
2019-04-18 18:13:05 -07:00
Steven Moreland
6d494b2346 Merge "Update hidl makefiles for bpfmt" am: ff0bd741ca
am: 96f40f7b02

Change-Id: Idbf030e4993067bdb8181321bca2de00c9b6f7ef
2019-04-18 14:34:45 -07:00
Steven Moreland
1ae4615d9f Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I1f69d292bc23a7cc293a66110cb02d597e1019ad
2019-04-17 09:38:50 -07:00
Peiyong Lin
65c7b60c65 Deprecate getDisplayBrightnessSupport.
Brightness is already a per display capability, we don't need this API.

BUG: 130313275
Test: build
Change-Id: I0a669aca19a2873df41bee82bd0e5e2775af8101
2019-04-15 14:04:10 -07:00
TreeHugger Robot
16b5d8a94a Merge "Fix composer@2.3 VTS tests." into qt-dev 2019-04-11 21:02:19 +00:00
Peiyong Lin
f13b305530 Fix composer@2.3 VTS tests.
Some required APIs must be implemented, and thus passthrough will always assume
the function pointers exist.

BUG: 130195295
Test: atest VtsHalGraphicsComposerV2_3Target
Change-Id: Ic2790363fcb116e66438697b1a2e64e71ffc8ac6
2019-04-10 16:25:05 -07:00
Marissa Wall
6952ddf596 mapper: support new usage and format
Update IMapper to use usage and format from
android.hardware.graphics.common@1.2. This enables support for
the usage HW_IMAGE_ENCODER and the format HSV_888 which is
already being defined and used.

Test: IMapper VTS tests
Bug: 79465976
Change-Id: I680beb6e5b1cd246c28d17f855f5c76a5831ce06
2019-04-10 12:29:05 -07:00
TreeHugger Robot
52f5328bd3 Merge "IMapper: change an error message" into qt-dev 2019-04-05 03:29:22 +00:00
Valerie Hau
7ae8af54b3 Revert "Revert "Mark layers with color transform client composition if not implemented.""
This reverts commit 6f5a48f7af.

Reason for revert: Reinstating with fix
Below is the original commit message:
SET_LAYER_COLOR_TRANSFORM is an optional API, and thus when it's not
implemented. we want to make sure we follow the spec to mark those layers as
client composition and add them into changed layers list proactively.

BUG: 115554640
Test: Verify with setting color transform manually.
Change-Id: Ia2e8634b01ee1b5c99893e86ef451f90337ef90f
2019-04-04 16:17:27 -07:00
Marissa Wall
4de153cd21 IMapper: change an error message
Change the error message that prints when IMapper 3.0 isn't present.
The old warning was causing unnecessary concerns.

Bug: 128013727
Test: compile
Change-Id: I197cd953d08a8e9f3bdee92cede973bf1b97dfe2
(cherry picked from commit ccbd24f633)
2019-04-04 23:05:51 +00:00
Andrew Chant
6f5a48f7af Revert "Mark layers with color transform client composition if not implemented."
This reverts commit c53ea9f5f8.

Reason for revert: Breaks some display output
Bug: 129945273
Bug: 115554640

Merged-In: If70a148ae6ad673b5dd03143b3f1ed73eaa1290f
Change-Id: If70a148ae6ad673b5dd03143b3f1ed73eaa1290f
2019-04-04 18:55:08 +00:00
Peiyong Lin
c53ea9f5f8 Mark layers with color transform client composition if not implemented.
SET_LAYER_COLOR_TRANSFORM is an optional API, and thus when it's not
implemented. we want to make sure we follow the spec to mark those layers as
client composition and add them into changed layers list proactively.

BUG: 115554640
Test: Verify with setting color transform manually.
Change-Id: I53b4039eb63cccd1b174e3c6da3b6336b85e0321
2019-04-03 13:32:20 -07:00
Eino-Ville Talvala
7c51e8492e graphics.mapper@2.0: Document previously-implicit accessRegion behavior.
Existing Android framework code (and transitively, CTS test) require
that an accessRegion of (0,0,0,0) is treated the same as an
accessRegion covering the entire buffer, when calling lock() or
lockYCbCr().

Document this so that there is no confusion about this going forward,
since this requirement pre-dates the HIDL HALs.

Bug: 119440345
Test: Builds
Change-Id: Id16831d3da4ec3dc74dbdca18447581a50ee1193
2019-03-28 16:51:39 -07:00
Valerie Hau
ef77263b2f Adding negative slot index check in ComposerResources
Bug: N/A
Test: build, boot
Change-Id: I8ab18ed8f7c322ee995abc534309b51e796276fe
2019-03-27 10:06:12 -07:00
Pawin Vongmasa
d80b5bb7dd Accompany HardwareBuffer with generation number
attachBuffer() should take a generation number and requestBuffer()
should return a generation number because AHardwareBuffer does not carry
the generation number.

Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Bug: 127778192
Change-Id: I201f84cf66f0e19b794a05c5ba88066360a37d96
2019-03-19 06:39:49 -07:00
Michael Wright
ff96aa8d47 Merge "Moved brightness from Lights to SF." 2019-03-12 21:16:25 +00:00
Steven Moreland
705fe94a47 Merge "bufferqueue@1.0: remove comment in function def" am: 5418f17004 am: 1b7da8b6bb
am: 095414578e

Change-Id: Ib83e63c4e21071c020de29b38c7898ac1a0e5cb7
2019-03-12 13:55:19 -07:00
Steven Moreland
62355801ca bufferqueue@1.0: remove comment in function def
Bug: 124382459
Test: manual
Change-Id: Ia99990d6ba3d50d81eb58735212142ec88a74293
2019-03-09 01:00:01 +00:00
Dan Gittik
3e83c4558a Moved brightness from Lights to SF.
Test: manual.
      Check that brightness works.
Fixes: 111435292

Change-Id: I3d19bc2fc4088bc9a956a5cf38c3b163fe35256f
2019-03-08 17:14:17 +00:00
Peiyong Lin
0a3c844398 Remove obsolete comments.
BUG: 127850729
Test: N/A
Change-Id: I6d45f30c129749a95050d3c046fbfe91d0a75f3e
2019-03-07 15:02:19 -08:00
Steven Moreland
87f43604b9 Merge "Update makefies: no 'types' internal" 2019-03-05 17:40:03 +00:00
Steven Moreland
7f4e21adda Merge "Update makefies: no 'types'" am: 4ee5ec1469 am: bab622f6a6
am: 7224bc9bcf

Change-Id: I434939e0770afa436c532a945542fce30a71ef7d
2019-03-04 16:05:59 -08:00
Steven Moreland
b91ac5c6a0 Update makefies: no 'types' internal
Bug: 123976090
Test: N/A
Change-Id: I84b659b163b63d39535b462a3df8a9c19f680976
2019-03-04 14:09:25 -08:00
Steven Moreland
a878aee9ab Update makefies: no 'types'
Bug: 123976090
Test: N/A
Change-Id: I30fb04c81889b62775e1b764b965fdb0f893de17
2019-03-04 11:27:17 -08:00
Peiyong Lin
3e7205d006 [composer] Remove implication. am: 849c980804 am: b48a6fa60a
am: d581ab1940

Change-Id: I5c38b7a6b15fbb52d11e27e334dd03c54784de35
2019-02-28 20:06:32 -08:00
Peiyong Lin
849c980804 [composer] Remove implication.
The spec of setLayerDataspace never specifies the types of layer it should be
call on, however, the spec has the implication that this method will only work
for layers with buffer, which is mis-leading. This patch changes the wording of
setLayerDataspace spec, removes the implication. Note that this change won't
break backward compatability.

BUG: 126713799
Test: N/A
Change-Id: I97f22469897cb687dcb64a3d419bcb48a3668e5a
2019-02-28 17:00:30 -08:00
Steven Moreland
f8a47b7f01 Update makefiles.
Bug: 123976090
Test: N/A
Change-Id: I5fb6c126a090a3fe0fa4829ea9224564133dc1ae
2019-02-11 21:14:16 -08:00
Shuzhen Wang
55386823a3 Camera: Add HAL interface change for HEIC
- Add new usage flag to indicate the consumer of the buffer is HEIC
encoder.
- Add new data space to indicate that the BLOB buffer is HEIC encoded.
- Add new BlobId to specify JPEG APPs segments.

Test: testHeic CTS test
Bug: 79465976
Change-Id: Iaa6a1d017223e84fc1c5dd0a9d90d9f09240e827
2019-02-04 16:44:16 -08:00