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

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

Merge "Attempt a load reset on touch mode start" into main

parents 1d88a752 a3c846db
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ aconfig_declarations_group {
        "aconfig_mediacodec_flags_java_lib",
        "aconfig_settingslib_flags_java_lib",
        "aconfig_trade_in_mode_flags_java_lib",
        "adpf_flags_java_lib",
        "android.adaptiveauth.flags-aconfig-java",
        "android.app.appfunctions.flags-aconfig-java",
        "android.app.assist.flags-aconfig-java",
@@ -874,6 +875,13 @@ java_aconfig_library {
    defaults: ["framework-minus-apex-aconfig-java-defaults"],
}

// Adaptive Performance
java_aconfig_library {
    name: "adpf_flags_java_lib",
    aconfig_declarations: "adpf_flags",
    defaults: ["framework-minus-apex-aconfig-java-defaults"],
}

// Graphics
java_aconfig_library {
    name: "hwui_flags_java_lib",
+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@
package android.view;
import static android.adpf.Flags.adpfViewrootimplActionDownBoost;
import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
import static android.content.pm.ActivityInfo.OVERRIDE_SANDBOX_VIEW_BOUNDS_APIS;
@@ -1209,6 +1210,8 @@ public final class ViewRootImpl implements ViewParent,
    private long mRenderThreadDrawStartTimeNs = -1;
    private long mFirstFramePresentedTimeNs = -1;
    private final boolean mSendPerfHintOnTouch;
    private static boolean sToolkitSetFrameRateReadOnlyFlagValue;
    private static boolean sToolkitFrameRateFunctionEnablingReadOnlyFlagValue;
    private static boolean sToolkitMetricsForFrameRateDecisionFlagValue;
@@ -1338,6 +1341,8 @@ public final class ViewRootImpl implements ViewParent,
                CompatChanges.isChangeEnabled(DISABLE_DRAW_WAKE_LOCK) && disableDrawWakeLock();
        mIsSubscribeGranularDisplayEventsEnabled =
                com.android.server.display.feature.flags.Flags.subscribeGranularDisplayEvents();
        mSendPerfHintOnTouch = adpfViewrootimplActionDownBoost();
    }
    public static void addFirstDrawHandler(Runnable callback) {
@@ -7112,6 +7117,10 @@ public final class ViewRootImpl implements ViewParent,
                + "touch mode is " + mAttachInfo.mInTouchMode);
        if (mAttachInfo.mInTouchMode == inTouchMode) return false;
        if (inTouchMode && mAttachInfo.mThreadedRenderer != null && mSendPerfHintOnTouch) {
            mAttachInfo.mThreadedRenderer.notifyExpensiveFrame();
        }
        // tell the window manager
        try {
            IWindowManager windowManager = WindowManagerGlobal.getWindowManagerService();