Merge "Fix potential memory leak of FrameTracker" into sc-dev am: aef0db8f94 am: 51b46e36b9

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

Change-Id: I18558faf8bec3395a30b5dbd5ee222dc29b90e43
This commit is contained in:
Wu Ahan
2021-07-20 15:39:39 +00:00
committed by Automerger Merge Worker
3 changed files with 26 additions and 9 deletions

View File

@@ -251,7 +251,7 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
// 2. The session never begun.
if (mBeginVsyncId == INVALID_ID) {
cancel(REASON_CANCEL_NOT_BEGUN);
} else if (mEndVsyncId == mBeginVsyncId) {
} else if (mEndVsyncId <= mBeginVsyncId) {
cancel(REASON_CANCEL_SAME_VSYNC);
} else {
if (DEBUG) {