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 am: a6907d35ea

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d2e02043f069e5649139fd42a4db0dbfc8ba50b
This commit is contained in:
TreeHugger Robot
2021-03-11 20:29:09 +00:00
committed by Automerger Merge Worker
parent 50be3d6492 a6907d35ea
commit fefdd45a4d
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.
*/
public synchronized void cancel() {
// The session is ongoing, end the trace session.
// That means the cancel call is from external invocation, not from end().
if (mBeginVsyncId != INVALID_ID && mEndVsyncId == INVALID_ID) {
// We don't need to end the trace section if it never begun.
if (mBeginVsyncId != INVALID_ID) {
Trace.endAsyncSection(mSession.getName(), (int) mBeginVsyncId);
}
mCancelled = true;