diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-10-25 21:59:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-10-25 21:59:24 +0000 |
| commit | c1d5e507e6325b5d76961e0cc165ce9dd5f6260b (patch) | |
| tree | 3454159be5cb6b6b47671071bbb5393ededf6ad5 /graphics | |
| parent | 70b2eb10f98217b2a5f2e41173c06b84cda2da06 (diff) | |
| parent | e4d3d5466d9c9eb60bd0d632ddfb7698e6eb169b (diff) | |
| download | android_hardware_interfaces-c1d5e507e6325b5d76961e0cc165ce9dd5f6260b.tar.gz android_hardware_interfaces-c1d5e507e6325b5d76961e0cc165ce9dd5f6260b.tar.bz2 android_hardware_interfaces-c1d5e507e6325b5d76961e0cc165ce9dd5f6260b.zip | |
Merge "remove USES_DISPLAY_RENDER_INTENTS from vts2.3"
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/composer/2.3/utils/hal/include/composer-hal/2.3/ComposerClient.h | 11 |
1 files changed, 0 insertions, 11 deletions
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 <typename Interface, typename Hal> class ComposerClientImpl : public V2_2::hal::detail::ComposerClientImpl<Interface, Hal> { public: Return<Error> 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<void> getRenderIntents_2_3(Display display, ColorMode mode, IComposerClient::getRenderIntents_2_3_cb hidl_cb) override { -#ifdef USES_DISPLAY_RENDER_INTENTS std::vector<RenderIntent> 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>({RenderIntent::COLORIMETRIC})); -#endif return Void(); } |