From 33adb57a7b3989a87ca83f4b6d6ac9b1f7e68262 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Mon, 22 Feb 2021 14:27:53 +0100
Subject: [PATCH] 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              | 1 -
 libs/hwui/renderthread/RenderProxy.cpp | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/hwui/JankTracker.cpp b/libs/hwui/JankTracker.cpp
index 4a2e30dd38f23..2cd9b7b39174d 100644
--- a/libs/hwui/JankTracker.cpp
+++ b/libs/hwui/JankTracker.cpp
@@ -236,7 +236,6 @@ void JankTracker::dumpFrames(int fd) {
 }
 
 void JankTracker::reset() {
-    std::lock_guard lock(mDataMutex);
     mFrames.clear();
     mData->reset();
     (*mGlobalData)->reset();
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp
index b9568fcf8e661..423cc08189cab 100644
--- a/libs/hwui/renderthread/RenderProxy.cpp
+++ b/libs/hwui/renderthread/RenderProxy.cpp
@@ -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) {