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

Commit 097e1d33 authored by John Reck's avatar John Reck
Browse files

Fix setPositionListener race condition 

Fixes: 131625115
Test: atest android.view.cts.SystemGestureExclusionRectsTest android.view.cts.SurfaceViewSyncTest android.uirendering.cts.testclasses.SurfaceViewTests

Change-Id: Ia357ff6fa5d5fe1e152abc23bbd6d8051cfd7aa7
parent 471a6643

libs/hwui/RenderNode.cpp

+6 −0
Original line number Diff line number Diff line
@@ -264,6 +264,12 @@ void RenderNode::syncProperties() { 
}



void RenderNode::pushStagingPropertiesChanges(TreeInfo& info) {

    if (mPositionListenerDirty) {

        mPositionListener = std::move(mStagingPositionListener);

        mStagingPositionListener = nullptr;

        mPositionListenerDirty = false;

    }



    // Push the animators first so that setupStartValueIfNecessary() is called

    // before properties() is trampled by stagingProperties(), as they are

    // required by some animators.

libs/hwui/RenderNode.h

+4 −4
Original line number Diff line number Diff line
@@ -188,11 +188,9 @@ public: 
        virtual void onPositionLost(RenderNode& node, const TreeInfo* info) = 0;

    };



    // Note this is not thread safe, this needs to be called

    // before the RenderNode is used for drawing.

    // RenderNode takes ownership of the pointer

    ANDROID_API void setPositionListener(PositionListener* listener) {

        mPositionListener = listener;

        mStagingPositionListener = listener;

        mPositionListenerDirty = true;

    }



    // This is only modified in MODE_FULL, so it can be safely accessed
@@ -275,6 +273,8 @@ private: 
    // mDisplayList, not mStagingDisplayList.

    uint32_t mParentCount;



    bool mPositionListenerDirty = false;

    sp<PositionListener> mStagingPositionListener;

    sp<PositionListener> mPositionListener;



    UsageHint mUsageHint = UsageHint::Unknown;