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

Commit 34f5e372 authored by Matt Buckley's avatar Matt Buckley Committed by Android (Google) Code Review
Browse files

Merge "Add ADPF FMQ implementation for PerformanceHintManager" into main

parents 2e3ffc1b 854947f3

core/java/android/os/IHintManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ interface IHintManager { 
     * if creation is supported but fails.

     */

    IHintSession createHintSessionWithConfig(in IBinder token, in int[] threadIds,

            in long durationNanos, in SessionTag tag, out @nullable SessionConfig config);

            in long durationNanos, in SessionTag tag, out SessionConfig config);



    /**

     * Get preferred rate limit in nanoseconds.
@@ -48,6 +48,6 @@ interface IHintManager { 
     *

     * Throws IllegalStateException if FMQ channel creation fails.

     */

    ChannelConfig getSessionChannel(in IBinder token);

    @nullable ChannelConfig getSessionChannel(in IBinder token);

    oneway void closeSessionChannel();

}

core/java/android/os/flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -106,14 +106,6 @@ flag { 
    bug: "315894228"

}



flag {

    name: "adpf_fmq_eager_send"

    namespace: "game"

    description: "Guards the use of an eager-sending optimization in FMQ for low-latency messages"

    is_fixed_read_only: true

    bug: "315894228"

}



flag {

    name: "adpf_hwui_gpu"

    namespace: "game"

native/android/libandroid.map.txt

+1 −0
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ LIBANDROID_PLATFORM { 
    APerformanceHint_sendHint;

    APerformanceHint_getThreadIds;

    APerformanceHint_createSessionInternal;

    APerformanceHint_setUseFMQForTesting;

    extern "C++" {

        ASurfaceControl_registerSurfaceStatsListener*;

        ASurfaceControl_unregisterSurfaceStatsListener*;

native/android/performance_hint.cpp

+288 −46

File changed.

Preview size limit exceeded, changes collapsed.

native/android/tests/performance_hint/Android.bp

+5 −2
Original line number Diff line number Diff line
@@ -36,10 +36,13 @@ cc_test { 
    srcs: ["PerformanceHintNativeTest.cpp"],



    shared_libs: [

        "android.hardware.common.fmq-V1-ndk",

        "libandroid",

        "liblog",

        "libbinder",

        "libbinder_ndk",

        "libcutils",

        "libfmq",

        "liblog",

        "libpowermanager",

        "libutils",

    ],
@@ -56,8 +59,8 @@ cc_test { 
    ],



    cflags: [

        "-Werror",

        "-Wall",

        "-Werror",

    ],



    header_libs: [