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

Commit 448b740d authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android-framework.lnx.2.0-00017. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1034907   I2f7a979295cac9a9427bbe0f2cb388518ebe5fc7   sf1 : Avoid resetting skip flag for dim layer

Change-Id: I47e59521069ca09d75c693be3c5002e1b2454729
CRs-Fixed: 1034907
parents 6c9ed1ae 010a6ab0

services/surfaceflinger/DisplayHardware/HWComposer_hwc1.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1042,7 +1042,6 @@ public: 
        }

    }

    virtual void setDim(uint32_t color) {

        setSkip(false);

        getLayer()->flags |= 0x80000000;

#ifdef QTI_BSP

        // Set RGBA color on HWC Dim layer
@@ -1123,7 +1122,7 @@ public: 
    virtual void setBuffer(const sp<GraphicBuffer>& buffer) {

        if (buffer == 0 || buffer->handle == 0) {

            getLayer()->compositionType = HWC_FRAMEBUFFER;

            getLayer()->flags |= HWC_SKIP_LAYER;

            getLayer()->flags |=  (getLayer()->flags & 0x80000000) ? 0 : HWC_SKIP_LAYER;

            getLayer()->handle = 0;

        } else {

            if (getLayer()->compositionType == HWC_SIDEBAND) {

services/surfaceflinger/LayerDim.cpp

+1 −1
Original line number Diff line number Diff line
@@ -75,13 +75,13 @@ void LayerDim::setPerFrameData(const sp<const DisplayDevice>& hw, 
        HWComposer::HWCLayerInterface& layer) {

  HWComposer& hwc = mFlinger->getHwComposer();



  Layer::setPerFrameData(hw, layer);

  if (hwc.hasDimComposition()) {

    // SF Client can set RGBA color on Dim layer. Solid Black is default.

    uint32_t color = getDrawingState().color;

    uint32_t rgba_color = !color ? 0x000000FF : color;

    layer.setDim(rgba_color);

  }

  Layer::setPerFrameData(hw, layer);

}

#endif