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

Commit a808c813 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.

This reverts commit 494e9f8a.
Now, with a fixed read only flag.

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

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",
@@ -1578,3 +1579,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
+10 −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"

  is_fixed_read_only: true

}