From e7bd22299a1f4fa2c9c091ae0eaefa4f68271f5c Mon Sep 17 00:00:00 2001 From: Dan Stoza Date: Tue, 15 May 2018 13:11:24 -0700 Subject: [PATCH] Composer 2.2: Fix readback docs Fixes a couple of problems with the return codes in the readback documentation and adds a paragraph of clarification about when getReadbackBufferAttributes will be called. Bug: 67048889 Test: N/A, doc fix only Change-Id: Ic91b8db207c1b4b1f18777bd316279747506149b --- current.txt | 2 +- graphics/composer/2.2/IComposerClient.hal | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/current.txt b/current.txt index 5ccd6abebb..62af23564e 100644 --- a/current.txt +++ b/current.txt @@ -327,7 +327,7 @@ a830336ac8627d6432cfafb1b884343ad9f885dee0a5323e380e6d3c519156b8 android.hardwar 83e7a10ff3702147bd7ffa04567b20d407a3b16bbb7705644af44d919afe9103 android.hardware.gnss@1.1::IGnssMeasurementCallback 0b96e0254e2168cfecb30c1ed5fb42681652cc00faa68c6e07568fafe64d1d50 android.hardware.graphics.common@1.1::types d9b40a5b09962a5a0780b10fe33a4e607e69e2e088fc83de88a584115b7cb1c0 android.hardware.graphics.composer@2.2::IComposer -18eff12102db47b03a5fa906f8d4fd9018f0fb9236c663d457b8eac8d57c2937 android.hardware.graphics.composer@2.2::IComposerClient +e7717f2ff2f6db43b24370ff08e14cd353da3004b32b17740e4a7ed4894b7e45 android.hardware.graphics.composer@2.2::IComposerClient dd83be076b6b3f10ed62ab34d8c8b95f2415961fb785200eb842e7bfb2b0ee92 android.hardware.graphics.mapper@2.1::IMapper 675682dd3007805c985eaaec91612abc88f4c25b3431fb84070b7584a1a741fb android.hardware.health@2.0::IHealth 434c4c32c00b0e54bb05e40c79503208b40f786a318029a2a4f66e34f10f2a76 android.hardware.health@2.0::IHealthInfoCallback diff --git a/graphics/composer/2.2/IComposerClient.hal b/graphics/composer/2.2/IComposerClient.hal index a6665a1230..2f0a3cca70 100644 --- a/graphics/composer/2.2/IComposerClient.hal +++ b/graphics/composer/2.2/IComposerClient.hal @@ -152,6 +152,11 @@ interface IComposerClient extends @2.1::IComposerClient { * output of the display remains the same (subject to the note about protected * content in the description of setReadbackBuffer). * + * If the active configuration or color mode of this display has changed + * since a previous call to this function, it must be called again prior to + * setting a readback buffer such that the returned format and dataspace can + * be updated accordingly. + * * Parameters: * @param display - the display on which to create the layer. * @@ -203,7 +208,13 @@ interface IComposerClient extends @2.1::IComposerClient { * must be non-NULL * @return error - is HWC2_ERROR_NONE or one of the following errors: * BAD_DISPLAY - an invalid display handle was passed in - * UNSUPPORTED if not supported on underlying HAL + * NO_RESOURCES - the readback operation was successful, but + * resulted in a different validate result than would + * have occurred without readback + * UNSUPPORTED - the readback operation was unsuccessful because of + * resource constraints, the presence of protected + * content, or other reasons; -1 must be returned for + * acquireFence * * See also: * getReadbackBufferAttributes