From c373f351079b2056ac62c4e2e974a61f97dcfb75 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Thu, 25 Feb 2021 18:34:17 +0100
Subject: [PATCH] Separate buffer stuffing and jank

Bug: 161781469
Test: Perfetto trace with CUJ
Change-Id: I8583342a50a1d54b7aede89aa81c98178269b357
---
 core/java/com/android/internal/jank/FrameTracker.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/java/com/android/internal/jank/FrameTracker.java b/core/java/com/android/internal/jank/FrameTracker.java
index e82cc737a395e..3b55fdfcd2ab6 100644
--- a/core/java/com/android/internal/jank/FrameTracker.java
+++ b/core/java/com/android/internal/jank/FrameTracker.java
@@ -316,11 +316,8 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener
             }
             if (info.surfaceControlCallbackFired) {
                 totalFramesCount++;
-
-                // Only count missed frames if it's not stuffed.
                 if ((info.jankType & PREDICTION_ERROR) != 0
-                        || ((info.jankType & JANK_APP_DEADLINE_MISSED) != 0
-                                && (info.jankType & BUFFER_STUFFING) == 0)) {
+                        || ((info.jankType & JANK_APP_DEADLINE_MISSED) != 0)) {
                     Log.w(TAG, "Missed App frame:" + info.jankType);
                     missedAppFramesCount++;
                 }