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

Commit dca99afb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add a few TODOs for removing getSfInstance" into tm-dev am: 4827ea25 

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

Change-Id: I9eb553f66d45556622dee94d55099c8c40988322
parents 334ddb9e 4827ea25

core/java/android/view/ViewRootImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -873,6 +873,7 @@ public final class ViewRootImpl implements ViewParent, 
        mDensity = context.getResources().getDisplayMetrics().densityDpi;

        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();

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

core/java/com/android/internal/graphics/SfVsyncFrameCallbackProvider.java

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.view.Choreographer; 
 *

 * @hide

 */

// TODO(b/222698397): remove getSfInstance/this class usage and use vsyncId for transactions

public final class SfVsyncFrameCallbackProvider implements AnimationFrameCallbackProvider {



    private final Choreographer mChoreographer;

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipInputConsumer.java

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ public class PipInputConsumer { 
        mMainExecutor.execute(() -> {

            // Choreographer.getSfInstance() must be called on the thread that the input event

            // receiver should be receiving events

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

            mInputEventReceiver = new InputEventReceiver(inputChannel,

                Looper.myLooper(), Choreographer.getSfInstance());

            if (mRegistrationListener != null) {

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMotionHelper.java

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, 
                final FrameCallbackScheduler scheduler = new FrameCallbackScheduler() {

                    @Override

                    public void postFrameCallback(@androidx.annotation.NonNull Runnable runnable) {

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

                        //  transactions

                        Choreographer.getSfInstance().postFrameCallback(t -> runnable.run());

                    }

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java

+1 −0
Original line number Diff line number Diff line
@@ -625,6 +625,7 @@ public class PipResizeGestureHandler { 


    class PipResizeInputEventReceiver extends BatchedInputEventReceiver {

        PipResizeInputEventReceiver(InputChannel channel, Looper looper) {

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

            super(channel, looper, Choreographer.getSfInstance());

        }