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

Commit f6833405 authored by Yichi Chen's avatar Yichi Chen
Browse files

SurfaceFlinger: Remove the duty of ColorLayer in computeCrop 

There is no active buffer in ColorLayer. Computing its source crop is
nonsense and may cause unwanted behavior in HWC.

Bug: b/109829386
Test: ColorLayer can be displayed correctly.

Change-Id: Ia30bb13e932a55a5cfb0a38da2c459d53dff5e3b
parent 983ebb59

services/surfaceflinger/ColorLayer.h

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ public: 
    bool isVisible() const override;



    void setPerFrameData(const sp<const DisplayDevice>& display) override;



protected:

    FloatRect computeCrop(const sp<const DisplayDevice>& /*display*/) const override { return {}; }

};



} // namespace android

services/surfaceflinger/Layer.h

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ protected: 


    uint32_t getEffectiveUsage(uint32_t usage) const;



    FloatRect computeCrop(const sp<const DisplayDevice>& display) const;

    virtual FloatRect computeCrop(const sp<const DisplayDevice>& display) const;

    // Compute the initial crop as specified by parent layers and the

    // SurfaceControl for this layer. Does not include buffer crop from the

    // IGraphicBufferProducer client, as that should not affect child clipping.