commit 33adb57a7b3989a87ca83f4b6d6ac9b1f7e68262
author Jorim Jaggi <jjaggi@google.com> Mon Feb 22 14:27:53 2021 +0100
committer Jorim Jaggi <jjaggi@google.com> Mon Feb 22 14:27:53 2021 +0100
tree 82d384813b281885607a188a4d10cce27e08ce63
parent 6844338efbdd87ed8d19e7e0666d43ca3c4f2f15

Don't double lock when resetting jank tests

Fixes: 180875541
Test: adb shell dumpsys com.android.systemui reset
Change-Id: Ie656730bbbbb249e6798617cf236b93332e79eb6

libs/hwui/JankTracker.cpp

diff --git a/libs/hwui/JankTracker.cpp b/libs/hwui/JankTracker.cpp
index 4a2e30d..2cd9b7b 100644
--- a/libs/hwui/JankTracker.cpp
+++ b/libs/hwui/JankTracker.cpp
@@ -236,7 +236,6 @@
 }
 
 void JankTracker::reset() {
-    std::lock_guard lock(mDataMutex);
     mFrames.clear();
     mData->reset();
     (*mGlobalData)->reset();

libs/hwui/renderthread/RenderProxy.cpp

diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp
index b9568fc..423cc08 100644
--- a/libs/hwui/renderthread/RenderProxy.cpp
+++ b/libs/hwui/renderthread/RenderProxy.cpp
@@ -230,7 +230,10 @@
 }
 
 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) {