Merge "Don't double lock when resetting jank tests" into sc-dev am: 349c039554

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13661705

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c9fbc36e3d3dfe43b853cd15510588d8e227043

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();

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) {