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

Commit 290a9a81 authored by James O'Leary's avatar James O'Leary Committed by Android (Google) Code Review
Browse files

Merge "Fix inability to dismiss Assistant answer when launcher frontmost" into... 

Merge "Fix inability to dismiss Assistant answer when launcher frontmost" into ub-launcher3-qt-r1-dev
parents 0121d466 71b6d249

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

+4 −2
Original line number Diff line number Diff line
@@ -657,11 +657,13 @@ public class TouchInteractionService extends Service implements 
            // In the case where we are in the excluded assistant state, ignore it and treat the

            // running activity as the task behind the assistant

            runningTaskInfo = mAM.getRunningTask(ACTIVITY_TYPE_ASSISTANT);

            if (!ActivityManagerWrapper.isHomeTask(runningTaskInfo)) {

                final ComponentName homeComponent =

                    mOverviewComponentObserver.getHomeIntent().getComponent();

                forceOverviewInputConsumer =

                    runningTaskInfo.baseIntent.getComponent().equals(homeComponent);

            }

        }



        if (runningTaskInfo == null && !sSwipeSharedState.goingToLauncher

                && !sSwipeSharedState.recentsAnimationFinishInterrupted) {