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

Merge "End the trace section in FrameTracker#cancel if it has begun" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-11 19:48:59 +00:00
committed by Android (Google) Code Review
parent 8529a9ba31 517a46d989
commit a6907d35ea
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/jank/FrameTracker.java
View File

@@ -206,9 +206,8 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
* Cancel the trace session of the CUJ. * Cancel the trace session of the CUJ.
*/ */
public synchronized void cancel() { public synchronized void cancel() {
// The session is ongoing, end the trace session. // We don't need to end the trace section if it never begun.
// That means the cancel call is from external invocation, not from end(). if (mBeginVsyncId != INVALID_ID) {
if (mBeginVsyncId != INVALID_ID && mEndVsyncId == INVALID_ID) {
Trace.endAsyncSection(mSession.getName(), (int) mBeginVsyncId); Trace.endAsyncSection(mSession.getName(), (int) mBeginVsyncId);
} }
mCancelled = true; mCancelled = true;