Merge "Removing USES_DISPLAY_RENDER_INTENTS check in ComposerClient.h"

    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);

    }