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

Commit 7a9923c2 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Fix issue with wrong token used for input consumer unregistration" into main

parents 9a8ecd95 b917c9ef

quickstep/src/com/android/quickstep/TouchInteractionService.java

+2 −1
Original line number Diff line number Diff line
@@ -491,6 +491,7 @@ public class TouchInteractionService extends Service { 
        mDeviceState = new RecentsAnimationDeviceState(this, true);

        mTaskbarManager = new TaskbarManager(this);

        mRotationTouchHelper = mDeviceState.getRotationTouchHelper();

        mInputConsumer = InputConsumerController.getRecentsAnimationInputConsumer();

        BootAwarePreloader.start(this);



        // Call runOnUserUnlocked() before any other callbacks to ensure everything is initialized.
@@ -538,13 +539,13 @@ public class TouchInteractionService extends Service { 


    @UiThread

    public void onUserUnlocked() {

        Log.d(TAG, "onUserUnlocked: userId=" + getUserId());

        mTaskAnimationManager = new TaskAnimationManager(this);

        mOverviewComponentObserver = new OverviewComponentObserver(this, mDeviceState);

        mOverviewCommandHelper = new OverviewCommandHelper(this,

                mOverviewComponentObserver, mTaskAnimationManager);

        mResetGestureInputConsumer = new ResetGestureInputConsumer(

                mTaskAnimationManager, mTaskbarManager::getCurrentActivityContext);

        mInputConsumer = InputConsumerController.getRecentsAnimationInputConsumer();

        mInputConsumer.registerInputConsumer();

        onSystemUiFlagsChanged(mDeviceState.getSystemUiStateFlags());

        onAssistantVisibilityChanged();