Merge "Fix inability to dismiss Assistant answer when launcher frontmost" into ub-launcher3-qt-r1-dev

This commit is contained in:
James O'Leary
2019-08-05 22:06:14 +00:00
committed by Android (Google) Code Review

View File

@@ -657,10 +657,12 @@ 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);
final ComponentName homeComponent =
if (!ActivityManagerWrapper.isHomeTask(runningTaskInfo)) {
final ComponentName homeComponent =
mOverviewComponentObserver.getHomeIntent().getComponent();
forceOverviewInputConsumer =
forceOverviewInputConsumer =
runningTaskInfo.baseIntent.getComponent().equals(homeComponent);
}
}
if (runningTaskInfo == null && !sSwipeSharedState.goingToLauncher