Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2be3570b authored by Peiyong Lin's avatar Peiyong Lin
Browse files

Make sure passthrough fails initialization if required interfaces can not be initialized. 

All required interfaces must be able to initialized, make sure passthrough
fails if the requirement is not met.

BUG: b/147365206
Test: boot
Change-Id: I148655bc5392b1c0bc45f33ea3d2020824bb6f4b
parent a8cc1918

graphics/composer/2.3/utils/passthrough/include/composer-passthrough/2.3/HwcHal.h

+7 −7
Original line number Diff line number Diff line
@@ -294,9 +294,6 @@ class HwcHalImpl : public V2_2::passthrough::detail::HwcHalImpl<Hal> { 
            (brightness < 0.0f && brightness != -1.0f)) {

            return Error::BAD_PARAMETER;

        }

        if (!mDispatch.setDisplayBrightness) {

            return Error::UNSUPPORTED;

        }

        int32_t error = mDispatch.setDisplayBrightness(mDevice, display, brightness);

        return static_cast<Error>(error);

    }
@@ -307,6 +304,13 @@ class HwcHalImpl : public V2_2::passthrough::detail::HwcHalImpl<Hal> { 
            return false;

        }



        if (!BaseType2_1::initDispatch(HWC2_FUNCTION_GET_DISPLAY_CAPABILITIES,

                                       &mDispatch.getDisplayCapabilities) ||

            !BaseType2_1::initDispatch(HWC2_FUNCTION_SET_DISPLAY_BRIGHTNESS,

                                       &mDispatch.setDisplayBrightness)) {

            return false;

        }



        this->initOptionalDispatch(HWC2_FUNCTION_GET_DISPLAY_IDENTIFICATION_DATA,

                                   &mDispatch.getDisplayIdentificationData);

        this->initOptionalDispatch(HWC2_FUNCTION_SET_LAYER_COLOR_TRANSFORM,
@@ -317,14 +321,10 @@ class HwcHalImpl : public V2_2::passthrough::detail::HwcHalImpl<Hal> { 
                                   &mDispatch.setDisplayedContentSamplingEnabled);

        this->initOptionalDispatch(HWC2_FUNCTION_GET_DISPLAYED_CONTENT_SAMPLE,

                                   &mDispatch.getDisplayedContentSample);

        this->initOptionalDispatch(HWC2_FUNCTION_GET_DISPLAY_CAPABILITIES,

                                   &mDispatch.getDisplayCapabilities);

        this->initOptionalDispatch(HWC2_FUNCTION_SET_LAYER_PER_FRAME_METADATA_BLOBS,

                                   &mDispatch.setLayerPerFrameMetadataBlobs);

        this->initOptionalDispatch(HWC2_FUNCTION_GET_DISPLAY_BRIGHTNESS_SUPPORT,

                                   &mDispatch.getDisplayBrightnessSupport);

        this->initOptionalDispatch(HWC2_FUNCTION_SET_DISPLAY_BRIGHTNESS,

                                   &mDispatch.setDisplayBrightness);

        return true;

    }

graphics/composer/2.4/utils/passthrough/include/composer-passthrough/2.4/HwcHal.h

+7 −4
Original line number Diff line number Diff line
@@ -220,12 +220,15 @@ class HwcHalImpl : public V2_3::passthrough::detail::HwcHalImpl<Hal> { 
            return false;

        }



        if (!BaseType2_1::initDispatch(HWC2_FUNCTION_GET_DISPLAY_VSYNC_PERIOD,

                                       &mDispatch.getDisplayVsyncPeriod) ||

            !BaseType2_1::initDispatch(HWC2_FUNCTION_SET_ACTIVE_CONFIG_WITH_CONSTRAINTS,

                                       &mDispatch.setActiveConfigWithConstraints)) {

            return false;

        }



        this->initOptionalDispatch(HWC2_FUNCTION_GET_DISPLAY_CONNECTION_TYPE,

                                   &mDispatch.getDisplayConnectionType);

        this->initOptionalDispatch(HWC2_FUNCTION_GET_DISPLAY_VSYNC_PERIOD,

                                   &mDispatch.getDisplayVsyncPeriod);

        this->initOptionalDispatch(HWC2_FUNCTION_SET_ACTIVE_CONFIG_WITH_CONSTRAINTS,

                                   &mDispatch.setActiveConfigWithConstraints);

        this->initOptionalDispatch(HWC2_FUNCTION_SET_AUTO_LOW_LATENCY_MODE,

                                   &mDispatch.setAutoLowLatencyMode);

        this->initOptionalDispatch(HWC2_FUNCTION_GET_SUPPORTED_CONTENT_TYPES,