Snap for 6342431 from b9d56bdcf9 to sc-release

Change-Id: I96118698d4cfbb2c062801cd774dfe6f410f8de9
This commit is contained in:
android-build-team Robot committed 2020-03-28 02:24:03 +00:00
commit d8f51978e5
1 file changed
+5 -13
@@ -442,7 +442,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
GestureState newGestureState = new GestureState(mOverviewComponentObserver,
ActiveGestureLog.INSTANCE.generateAndSetLogId());
newGestureState.updateRunningTask(TraceHelper.whitelistIpcs("getRunningTask.0",
() -> mAM.getRunningTask(0)));
() -> mAM.getRunningTask(true /* filterOnlyVisibleRecents */)));
if (mDeviceState.isInSwipeUpTouchRegion(event)) {
mConsumer.onConsumerAboutToBeSwitched();
@@ -577,18 +577,10 @@ public class TouchInteractionService extends Service implements PluginListener<O
return createDeviceLockedInputConsumer(gestureState);
}
boolean forceOverviewInputConsumer = false;
if (AssistantUtilities.isExcludedAssistant(gestureState.getRunningTask())) {
// In the case where we are in the excluded assistant state, ignore it and treat the
// running activity as the task behind the assistant
gestureState.updateRunningTask(TraceHelper.whitelistIpcs("getRunningTask.assistant",
() -> mAM.getRunningTask(ACTIVITY_TYPE_ASSISTANT /* ignoreActivityType */)));
ComponentName homeComponent = mOverviewComponentObserver.getHomeIntent().getComponent();
ComponentName runningComponent =
gestureState.getRunningTask().baseIntent.getComponent();
forceOverviewInputConsumer =
runningComponent != null && runningComponent.equals(homeComponent);
}
RunningTaskInfo runningTask = gestureState.getRunningTask();
ComponentName homeComponent = mOverviewComponentObserver.getHomeIntent().getComponent();
boolean forceOverviewInputConsumer = runningTask != null
&& runningTask.baseIntent.getComponent().equals(homeComponent);
if (previousGestureState.getFinishingRecentsAnimationTaskId() > 0) {
// If the finish animation was interrupted, then continue using the other activity input