Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c9fbc36e3d3dfe43b853cd15510588d8e227043
This commit is contained in:
TreeHugger Robot
2021-02-22 15:26:16 +00:00
committed by Automerger Merge Worker
parent f421eabfc4 349c039554
commit 2eda8acba9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/hwui/JankTracker.cpp
View File

@@ -236,7 +236,6 @@ void JankTracker::dumpFrames(int fd) {
} }
void JankTracker::reset() { void JankTracker::reset() {
std::lock_guard lock(mDataMutex);
mFrames.clear(); mFrames.clear();
mData->reset(); mData->reset();
(*mGlobalData)->reset(); (*mGlobalData)->reset();

5
libs/hwui/renderthread/RenderProxy.cpp
View File

@@ -230,7 +230,10 @@ void RenderProxy::dumpProfileInfo(int fd, int dumpFlags) {
} }
void RenderProxy::resetProfileInfo() { 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) { uint32_t RenderProxy::frameTimePercentile(int percentile) {