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

Commit 9d7393f5 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6305839 from 1032fac2 to rvc-release 

Change-Id: I40e119862488badc75061a5c83cb81059ac22a58
parents cd4a3fee 1032fac2

services/surfaceflinger/Layer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -220,6 +220,9 @@ void Layer::removeFromCurrentState() { 
    }



    mFlinger->markLayerPendingRemovalLocked(this);

    if (hasInput()) {

        mFlinger->dirtyInput();

    }

}



void Layer::onRemovedFromCurrentState() {

services/surfaceflinger/SurfaceTracing.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ private: 
    std::condition_variable mCanStartTrace;



    std::mutex& mSfLock;

    uint32_t mTraceFlags GUARDED_BY(mSfLock) = TRACE_ALL;

    uint32_t mTraceFlags GUARDED_BY(mSfLock) = TRACE_CRITICAL | TRACE_INPUT;

    const char* mWhere GUARDED_BY(mSfLock) = "";



    mutable std::mutex mTraceLock;