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

Commit e3f070a1 authored by Tony Huang's avatar Tony Huang
Browse files

[Re-land] Remove getSfInstance usage from ViewRootImpl 

The getSfInstance usage on ViewRootImpl is target to reduce jank
when moving split divider, but legacy split is going to be depracated
and it didn't used on new split too so we can remove whole related
codes safely.

Bug: 222696368
Test: build pass
Change-Id: Id492c738942c2e01fce85c231350d16ef88242f5
parent ef8f854a

core/java/android/view/SurfaceControlViewHost.java

+2 −8
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.os.RemoteException;

import android.util.Log;

import android.window.WindowTokenClient;

import android.view.accessibility.IAccessibilityEmbeddedConnection;

import android.window.WindowTokenClient;



import java.util.Objects;
@@ -271,14 +271,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, new WindowlessWindowLayout(), useSfChoreographer);

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

        addConfigCallback(c, d);



        WindowManagerGlobal.getInstance().addWindowlessRoot(mViewRoot);

core/java/android/view/ViewRootImpl.java

+2 −9
Original line number Diff line number Diff line
@@ -902,17 +902,11 @@ public final class ViewRootImpl implements ViewParent, 
    private String mTag = TAG;



    public ViewRootImpl(Context context, Display display) {

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

                false /* useSfChoreographer */);

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

    }



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

            WindowLayout windowLayout) {

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

    }



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

            WindowLayout windowLayout, boolean useSfChoreographer) {

        mContext = context;

        mWindowSession = session;

        mWindowLayout = windowLayout;
@@ -944,8 +938,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
@@ -20,7 +20,6 @@ import static android.os.Process.THREAD_PRIORITY_BACKGROUND; 
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;
@@ -31,11 +30,9 @@ import android.view.Choreographer; 


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.ShellBackgroundThread;
@@ -194,30 +191,6 @@ public abstract class WMShellConcurrencyModule { 
        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);

        }

    }



    /**

     * Provides a Shell background thread Handler for low priority background tasks.

     */

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java

+3 −4
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> 
        lp.setTrustedOverlay();

        if (mViewHost == null) {

            mViewHost = mSurfaceControlViewHostFactory.create(mDecorWindowContext, mDisplay,

                    mCaptionWindowManager, true);

                    mCaptionWindowManager);

            mViewHost.setView(outResult.mRootView, lp);

        } else {

            mViewHost.relayout(lp);
@@ -345,9 +345,8 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> 
    }



    interface SurfaceControlViewHostFactory {

        default SurfaceControlViewHost create(

                Context c, Display d, WindowlessWindowManager wmm, boolean useSfChoreographer) {

            return new SurfaceControlViewHost(c, d, wmm, useSfChoreographer);

        default SurfaceControlViewHost create(Context c, Display d, WindowlessWindowManager wmm) {

            return new SurfaceControlViewHost(c, d, wmm);

        }

    }

}