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

Commit 9dfb43e1 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Remove getSfInstance usage from ViewRootImpl" into tm-dev am: 9074b73e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17636144



Change-Id: If733c647e8981bc1a83e17c9ad4013d54b36d7a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a166867e 9074b73e

core/java/android/view/SurfaceControlViewHost.java

+1 −7
Original line number Diff line number Diff line
@@ -264,14 +264,8 @@ public class SurfaceControlViewHost { 
    /** @hide */

    public SurfaceControlViewHost(@NonNull Context c, @NonNull Display d,

            @NonNull WindowlessWindowManager wwm) {

        this(c, d, wwm, false /* useSfChoreographer */);

    }



    /** @hide */

    public SurfaceControlViewHost(@NonNull Context c, @NonNull Display d,

            @NonNull WindowlessWindowManager wwm, boolean useSfChoreographer) {

        mWm = wwm;

        mViewRoot = new ViewRootImpl(c, d, mWm, useSfChoreographer);

        mViewRoot = new ViewRootImpl(c, d, mWm);

        WindowManagerGlobal.getInstance().addWindowlessRoot(mViewRoot);



        mAccessibilityEmbeddedConnection = mViewRoot.getAccessibilityEmbeddedConnection();

core/java/android/view/ViewRootImpl.java

+2 −9
Original line number Diff line number Diff line
@@ -852,16 +852,10 @@ public final class ViewRootImpl implements ViewParent, 
    private String mTag = TAG;



    public ViewRootImpl(Context context, Display display) {

        this(context, display, WindowManagerGlobal.getWindowSession(),

                false /* useSfChoreographer */);

        this(context, display, WindowManagerGlobal.getWindowSession());

    }



    public ViewRootImpl(@UiContext Context context, Display display, IWindowSession session) {

        this(context, display, session, false /* useSfChoreographer */);

    }



    public ViewRootImpl(@UiContext Context context, Display display, IWindowSession session,

            boolean useSfChoreographer) {

        mContext = context;

        mWindowSession = session;

        mDisplay = display;
@@ -893,8 +887,7 @@ public final class ViewRootImpl implements ViewParent, 
        mNoncompatDensity = context.getResources().getDisplayMetrics().noncompatDensityDpi;

        mFallbackEventHandler = new PhoneFallbackEventHandler(context);

        // TODO(b/222696368): remove getSfInstance usage and use vsyncId for transactions

        mChoreographer = useSfChoreographer

                ? Choreographer.getSfInstance() : Choreographer.getInstance();

        mChoreographer = Choreographer.getInstance();

        mDisplayManager = (DisplayManager)context.getSystemService(Context.DISPLAY_SERVICE);

        mInsetsController = new InsetsController(new ViewRootInsetsControllerHost(this));

        mHandwritingInitiator = new HandwritingInitiator(mViewConfiguration,

libs/WindowManager/Shell/src/com/android/wm/shell/common/SystemWindows.java

+1 −2
Original line number Diff line number Diff line
@@ -221,8 +221,7 @@ public class SystemWindows { 
            }

            final Display display = mDisplayController.getDisplay(mDisplayId);

            SurfaceControlViewHost viewRoot =

                    new SurfaceControlViewHost(

                            view.getContext(), display, wwm, true /* useSfChoreographer */);

                    new SurfaceControlViewHost(view.getContext(), display, wwm);

            attrs.flags |= FLAG_HARDWARE_ACCELERATED;

            viewRoot.setView(view, attrs);

            mViewRoots.put(view, viewRoot);

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellConcurrencyModule.java

+0 −27
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.dagger; 
import static android.os.Process.THREAD_PRIORITY_DISPLAY;

import static android.os.Process.THREAD_PRIORITY_TOP_APP_BOOST;



import android.animation.AnimationHandler;

import android.content.Context;

import android.os.Build;

import android.os.Handler;
@@ -29,11 +28,9 @@ import android.os.Trace; 


import androidx.annotation.Nullable;



import com.android.internal.graphics.SfVsyncFrameCallbackProvider;

import com.android.wm.shell.R;

import com.android.wm.shell.common.HandlerExecutor;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.annotations.ChoreographerSfVsync;

import com.android.wm.shell.common.annotations.ExternalMainThread;

import com.android.wm.shell.common.annotations.ShellAnimationThread;

import com.android.wm.shell.common.annotations.ShellMainThread;
@@ -171,28 +168,4 @@ public abstract class WMShellConcurrencyModule { 
        shellSplashscreenThread.start();

        return new HandlerExecutor(shellSplashscreenThread.getThreadHandler());

    }



    /**

     * Provide a Shell main-thread AnimationHandler.  The AnimationHandler can be set on

     * {@link android.animation.ValueAnimator}s and will ensure that the animation will run on

     * the Shell main-thread with the SF vsync.

     */

    @WMSingleton

    @Provides

    @ChoreographerSfVsync

    public static AnimationHandler provideShellMainExecutorSfVsyncAnimationHandler(

            @ShellMainThread ShellExecutor mainExecutor) {

        try {

            AnimationHandler handler = new AnimationHandler();

            mainExecutor.executeBlocking(() -> {

                // This is called on the animation thread since it calls

                // Choreographer.getSfInstance() which returns a thread-local Choreographer instance

                // that uses the SF vsync

                handler.setProvider(new SfVsyncFrameCallbackProvider());

            });

            return handler;

        } catch (InterruptedException e) {

            throw new RuntimeException("Failed to initialize SfVsync animation handler in 1s", e);

        }

    }

}

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+2 −5
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.wm.shell.dagger;



import android.animation.AnimationHandler;

import android.content.Context;

import android.content.pm.LauncherApps;

import android.os.Handler;
@@ -42,7 +41,6 @@ import com.android.wm.shell.common.SyncTransactionQueue; 
import com.android.wm.shell.common.SystemWindows;

import com.android.wm.shell.common.TaskStackListenerImpl;

import com.android.wm.shell.common.TransactionPool;

import com.android.wm.shell.common.annotations.ChoreographerSfVsync;

import com.android.wm.shell.common.annotations.ShellMainThread;

import com.android.wm.shell.freeform.FreeformTaskListener;

import com.android.wm.shell.fullscreen.FullscreenUnfoldController;
@@ -182,11 +180,10 @@ public class WMShellModule { 
            DisplayImeController displayImeController, TransactionPool transactionPool,

            ShellTaskOrganizer shellTaskOrganizer, SyncTransactionQueue syncQueue,

            TaskStackListenerImpl taskStackListener, Transitions transitions,

            @ShellMainThread ShellExecutor mainExecutor,

            @ChoreographerSfVsync AnimationHandler sfVsyncAnimationHandler) {

            @ShellMainThread ShellExecutor mainExecutor) {

        return new LegacySplitScreenController(context, displayController, systemWindows,

                displayImeController, transactionPool, shellTaskOrganizer, syncQueue,

                taskStackListener, transitions, mainExecutor, sfVsyncAnimationHandler);

                taskStackListener, transitions, mainExecutor);

    }



    @WMSingleton