diff options
author | Valerie Hau <vhau@google.com> | 2018-11-19 10:50:02 -0800 |
---|---|---|
committer | Valerie Hau <vhau@google.com> | 2018-11-19 10:50:02 -0800 |
commit | 01c541c93fbaa167f1703ad36f82ad9e82348190 (patch) | |
tree | 84b1fa1ba89026fab531ad0f39b457fd2a912322 /graphics | |
parent | ef2753e4e6c70954cd896b2706f2515f62b61a57 (diff) | |
download | platform_hardware_interfaces-01c541c93fbaa167f1703ad36f82ad9e82348190.tar.gz platform_hardware_interfaces-01c541c93fbaa167f1703ad36f82ad9e82348190.tar.bz2 platform_hardware_interfaces-01c541c93fbaa167f1703ad36f82ad9e82348190.zip |
Removing USES_DISPLAY_RENDER_INTENTS check in ComposerClient.h
Test: ./VtsHalGraphicsComposerV2_2TargetTest
Change-Id: Ibe5800c22927c16619db864193594f70dc2a4b7f
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/composer/2.2/utils/hal/include/composer-hal/2.2/ComposerClient.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/graphics/composer/2.2/utils/hal/include/composer-hal/2.2/ComposerClient.h b/graphics/composer/2.2/utils/hal/include/composer-hal/2.2/ComposerClient.h index a6871fb494..c760d0a421 100644 --- a/graphics/composer/2.2/utils/hal/include/composer-hal/2.2/ComposerClient.h +++ b/graphics/composer/2.2/utils/hal/include/composer-hal/2.2/ComposerClient.h @@ -132,24 +132,13 @@ class ComposerClientImpl : public V2_1::hal::detail::ComposerClientImpl<Interfac Return<void> getRenderIntents(Display display, ColorMode mode, IComposerClient::getRenderIntents_cb hidl_cb) override { -#ifdef USES_DISPLAY_RENDER_INTENTS std::vector<RenderIntent> intents; Error err = mHal->getRenderIntents(display, mode, &intents); hidl_cb(err, intents); -#else - (void)display; - (void)mode; - hidl_cb(Error::NONE, hidl_vec<RenderIntent>({RenderIntent::COLORIMETRIC})); -#endif return Void(); } Return<Error> setColorMode_2_2(Display display, ColorMode mode, RenderIntent intent) override { -#ifndef USES_DISPLAY_RENDER_INTENTS - if (intent != RenderIntent::COLORIMETRIC) { - return Error::BAD_PARAMETER; - } -#endif return mHal->setColorMode_2_2(display, mode, intent); } |