commit 1a1427d11bc9098a82707a928836f61dee02fa56
author Pascal Mütschard <pmuetschard@google.com> Wed Aug 21 10:47:58 2024 +0200
committer Pascal Mütschard <pmuetschard@google.com> Wed Aug 28 11:32:52 2024 +0000
tree c21d0edffa8394e6d81121024616f5303cd7ad3b
parent 8abf3c01c4af0b9c18e2034e957d91cba7e283b1

Use the expected frame duration from SF instead of HWUI.

We often don't get the HWUI callback and want to remove needing the HWUI
callback in the future.

Bug: b/354763298
Test: FrameworksCoreTests manual
Flag: com.android.internal.jank.use_sf_frame_duration
Change-Id: I0e1929ced43729a3ca140c079efcc98b5bd51e7c

AconfigFlags.bp

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 3c5686b..edb119e 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -100,6 +100,7 @@
         "framework-jobscheduler-job.flags-aconfig-java",
         "framework_graphics_flags_java_lib",
         "hwui_flags_java_lib",
+        "interaction_jank_monitor_flags_lib",
         "libcore_exported_aconfig_flags_lib",
         "libgui_flags_java_lib",
         "power_flags_lib",
@@ -1565,3 +1566,17 @@
     aconfig_declarations: "dropbox_flags",
     defaults: ["framework-minus-apex-aconfig-java-defaults"],
 }
+
+// Zero Jank
+aconfig_declarations {
+    name: "interaction_jank_monitor_flags",
+    package: "com.android.internal.jank",
+    container: "system",
+    srcs: ["core/java/com/android/internal/jank/flags.aconfig"],
+}
+
+java_aconfig_library {
+    name: "interaction_jank_monitor_flags_lib",
+    aconfig_declarations: "interaction_jank_monitor_flags",
+    defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}

core/java/com/android/internal/jank/FrameTracker.java

diff --git a/core/java/com/android/internal/jank/FrameTracker.java b/core/java/com/android/internal/jank/FrameTracker.java
index 2254e94..d474c6d 100644
--- a/core/java/com/android/internal/jank/FrameTracker.java
+++ b/core/java/com/android/internal/jank/FrameTracker.java
@@ -158,12 +158,17 @@
             this.surfaceControlCallbackFired = true;
             this.jankType = jankStat.jankType;
             this.refreshRate = DisplayRefreshRate.getRefreshRate(jankStat.frameIntervalNs);
+            if (Flags.useSfFrameDuration()) {
+                this.totalDurationNanos = jankStat.actualAppFrameTimeNs;
+            }
             return this;
         }
 
         private JankInfo update(long totalDurationNanos, boolean isFirstFrame) {
             this.hwuiCallbackFired = true;
-            this.totalDurationNanos = totalDurationNanos;
+            if (!Flags.useSfFrameDuration()) {
+                this.totalDurationNanos = totalDurationNanos;
+            }
             this.isFirstFrame = isFirstFrame;
             return this;
         }

core/java/com/android/internal/jank/flags.aconfig

diff --git a/core/java/com/android/internal/jank/flags.aconfig b/core/java/com/android/internal/jank/flags.aconfig
new file mode 100644
index 0000000..676bb70
--- /dev/null
+++ b/core/java/com/android/internal/jank/flags.aconfig
@@ -0,0 +1,9 @@
+package: "com.android.internal.jank"
+container: "system"
+
+flag {
+  name: "use_sf_frame_duration"
+  namespace: "android_platform_window_surfaces"
+  description: "Whether to get the frame duration from SurfaceFlinger, or HWUI"
+  bug: "354763298"
+}