From e4d3d5466d9c9eb60bd0d632ddfb7698e6eb169b Mon Sep 17 00:00:00 2001 From: Kevin DuBois Date: Thu, 25 Oct 2018 09:42:23 -0700 Subject: remove USES_DISPLAY_RENDER_INTENTS from vts2.3 Removes the USES_DISPLAY_RENDER_INTENTS macro from the 2.3 vts suite. Test: ./VtsHalGraphicsComposerV2_3TargetTest (passes same # of tests Test: before and after) Bug: 118434553 Change-Id: I32fbbf4f09d5ead1143af56f39bdf9e8dc2bfc4c --- .../2.3/utils/hal/include/composer-hal/2.3/ComposerClient.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'graphics') diff --git a/graphics/composer/2.3/utils/hal/include/composer-hal/2.3/ComposerClient.h b/graphics/composer/2.3/utils/hal/include/composer-hal/2.3/ComposerClient.h index 90603a765..f9d677465 100644 --- a/graphics/composer/2.3/utils/hal/include/composer-hal/2.3/ComposerClient.h +++ b/graphics/composer/2.3/utils/hal/include/composer-hal/2.3/ComposerClient.h @@ -39,25 +39,14 @@ template class ComposerClientImpl : public V2_2::hal::detail::ComposerClientImpl { public: Return setColorMode_2_3(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_3(display, mode, intent); } Return getRenderIntents_2_3(Display display, ColorMode mode, IComposerClient::getRenderIntents_2_3_cb hidl_cb) override { -#ifdef USES_DISPLAY_RENDER_INTENTS std::vector intents; Error err = mHal->getRenderIntents_2_3(display, mode, &intents); hidl_cb(err, intents); -#else - (void)display; - (void)mode; - hidl_cb(Error::NONE, hidl_vec({RenderIntent::COLORIMETRIC})); -#endif return Void(); } -- cgit v1.2.3