Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a1427d1 authored by Pascal Mütschard's avatar Pascal Mütschard
Browse files

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
parent 8abf3c01

AconfigFlags.bp

+15 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ aconfig_declarations_group { 
        "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 @@ java_aconfig_library { 
    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

+6 −1
Original line number Diff line number Diff line
@@ -158,12 +158,17 @@ public class FrameTracker implements HardwareRendererObserver.OnFrameMetricsAvai 
            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;

            if (!Flags.useSfFrameDuration()) {

                this.totalDurationNanos = totalDurationNanos;

            }

            this.isFirstFrame = isFirstFrame;

            return this;

        }

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

0 → 100644
+9 −0
Original line number Diff line number Diff line 
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"

}