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

Commit 14b791af authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not send HdrMetadata on older interface" into pi-dev

parents 93ec3a87 301bb309

services/surfaceflinger/BufferLayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ void BufferLayer::setPerFrameData(const sp<const DisplayDevice>& displayDevice) 


    const HdrMetadata& metadata = mConsumer->getCurrentHdrMetadata();

    error = hwcLayer->setHdrMetadata(metadata);

    if (error != HWC2::Error::None) {

    if (error != HWC2::Error::None && error != HWC2::Error::Unsupported) {

        ALOGE("[%s] Failed to set hdrMetadata: %s (%d)", mName.string(),

              to_string(error).c_str(), static_cast<int32_t>(error));

    }

services/surfaceflinger/DisplayHardware/ComposerHal.cpp

+3 −0
Original line number Diff line number Diff line
@@ -706,6 +706,9 @@ Error Composer::setLayerDataspace(Display display, Layer layer, 
}



Error Composer::setLayerHdrMetadata(Display display, Layer layer, const HdrMetadata& metadata) {

    if (!mClient_2_2) {

        return Error::UNSUPPORTED;

    }



    mWriter.selectDisplay(display);

    mWriter.selectLayer(layer);