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

Commit 349c0395 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't double lock when resetting jank tests" into sc-dev

parents bc7b7bd1 33adb57a

libs/hwui/JankTracker.cpp

+0 −1
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ void JankTracker::dumpFrames(int fd) { 
}



void JankTracker::reset() {

    std::lock_guard lock(mDataMutex);

    mFrames.clear();

    mData->reset();

    (*mGlobalData)->reset();

libs/hwui/renderthread/RenderProxy.cpp

+4 −1
Original line number Diff line number Diff line
@@ -230,7 +230,10 @@ void RenderProxy::dumpProfileInfo(int fd, int dumpFlags) { 
}



void RenderProxy::resetProfileInfo() {

    mRenderThread.queue().runSync([=]() { mContext->resetFrameStats(); });

    mRenderThread.queue().runSync([=]() {

        std::lock_guard lock(mRenderThread.getJankDataMutex());

        mContext->resetFrameStats();

    });

}



uint32_t RenderProxy::frameTimePercentile(int percentile) {