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

Commit 95b5c407 authored by Tiger's avatar Tiger Committed by Android Build Coastguard Worker
Browse files

Stop using vsyncId from Choreographer#getSfInstance 

This CL passes the VsyncId obtained from Choreographer.getInstance()
instead.

Fix: 349176607
Bug: 222696368
Flag: EXEMPT bugfix
Test: 1. adb shell setprop persist.wm.debug.sc.tx.log_match_call setFrameTimelineVsync
      2. adb root; adb shell stop; adb shell start
      3. adb logcat -s SurfaceControlRegistry
      4. Open Settings
      5. Bring up IME
      See if the vsync id is a valid, increasing number
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6457ef80a69623ecf3a7b88fbcd8120359070ca7)
Merged-In: I49b16bf4badde8c9185c90534d2d013a1f78caec
Change-Id: I49b16bf4badde8c9185c90534d2d013a1f78caec
parent d217a53b

core/java/android/view/InsetsAnimationThreadControlRunner.java

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public class InsetsAnimationThreadControlRunner implements InsetsAnimationContro 
                SyncRtSurfaceTransactionApplier.SurfaceParams surfaceParams = params[i];

                applyParams(t, surfaceParams, mTmpFloat9);

            }

            t.setFrameTimelineVsync(Choreographer.getSfInstance().getVsyncId());

            t.setFrameTimelineVsync(Choreographer.getInstance().getVsyncId());

            t.apply();

            t.close();

        }

core/java/android/view/ViewRootImpl.java

+0 −1
Original line number Diff line number Diff line
@@ -1267,7 +1267,6 @@ 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 = Choreographer.getInstance();

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

        mImeBackAnimationController = new ImeBackAnimationController(this, mInsetsController);