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

Commit 8a01fa4d authored by chaviw's avatar chaviw
Browse files

Update typeId for BufferQueueLayer and BufferStateLayer 

Currently BufferQueueLayer and BufferStateLayer have typeId BufferLayer.
Changed to use more specific typeIds so they can be identified when
dumping state.

Also renamed getTypeId to getType since it was not returning an ID, but
rather a char* name

Test: adb shell dumpsys SurfaceFlinger
Change-Id: Ic80e995fa37acb2a9f21ea91bae8608657bf0bf1
parent becd6bd4

services/surfaceflinger/BufferLayer.h

+0 −4
Original line number Diff line number Diff line
@@ -62,10 +62,6 @@ public: 
    void useSurfaceDamage() override;

    void useEmptyDamage() override;



    // getTypeId - Provide unique string for each class type in the Layer

    // hierarchy

    const char* getTypeId() const override { return "BufferLayer"; }



    bool isOpaque(const Layer::State& s) const override;



    // isVisible - true if this layer is visible, false otherwise

services/surfaceflinger/BufferQueueLayer.h

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ public: 
    // Interface implementation for Layer

    // -----------------------------------------------------------------------

public:

    const char* getType() const override { return "BufferQueueLayer"; }



    void onLayerDisplayed(const sp<Fence>& releaseFence) override;



    void setTransformHint(uint32_t orientation) const override;

services/surfaceflinger/BufferStateLayer.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ public: 
    // -----------------------------------------------------------------------

    // Interface implementation for Layer

    // -----------------------------------------------------------------------

    const char* getType() const override { return "BufferStateLayer"; }



    void onLayerDisplayed(const sp<Fence>& releaseFence) override;

    void setTransformHint(uint32_t orientation) const override;

    void releasePendingBuffer(nsecs_t dequeueReadyTime) override;

services/surfaceflinger/ColorLayer.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ public: 


    std::shared_ptr<compositionengine::Layer> getCompositionLayer() const override;



    virtual const char* getTypeId() const { return "ColorLayer"; }

    const char* getType() const override { return "ColorLayer"; }

    bool isVisible() const override;



    bool setColor(const half3& color) override;

services/surfaceflinger/ContainerLayer.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public: 
    explicit ContainerLayer(const LayerCreationArgs&);

    ~ContainerLayer() override;



    const char* getTypeId() const override { return "ContainerLayer"; }

    const char* getType() const override { return "ContainerLayer"; }

    bool isVisible() const override;



    bool canReceiveInput() const override;