commit d7f202d2fa7d4fa214e6f1b21d86372233332619
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 02 18:00:19 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 02 18:00:19 2021 +0000
tree fcbba56a1037a55749caf3329302167ba3b6b685
parent f76775af4374b9cdda21cc1616cf0fd6937d4c13
parent 2045ddf290b9b7b0f043d0189a5680a030aef9c2

Merge "Add SurfaceFlingerStuffing case to toString()" into sc-dev

services/surfaceflinger/FrameTimeline/FrameTimeline.cpp

diff --git a/services/surfaceflinger/FrameTimeline/FrameTimeline.cpp b/services/surfaceflinger/FrameTimeline/FrameTimeline.cpp
index f19e2a7..9b03287 100644
--- a/services/surfaceflinger/FrameTimeline/FrameTimeline.cpp
+++ b/services/surfaceflinger/FrameTimeline/FrameTimeline.cpp
@@ -136,6 +136,10 @@
         janks.emplace_back("Unknown jank");
         jankType &= ~JankType::Unknown;
     }
+    if (jankType & JankType::SurfaceFlingerStuffing) {
+        janks.emplace_back("SurfaceFlinger Stuffing");
+        jankType &= ~JankType::SurfaceFlingerStuffing;
+    }
 
     // jankType should be 0 if all types of jank were checked for.
     LOG_ALWAYS_FATAL_IF(jankType != 0, "Unrecognized jank type value 0x%x", jankType);