diff options
| author | 2025-03-24 12:34:44 -0700 | |
|---|---|---|
| committer | 2025-03-24 12:34:44 -0700 | |
| commit | 0599eaa522873fa3786bcdb5ab5c9b986da93488 (patch) | |
| tree | ee0a3d849f04282e0a2b06aafdaaffea150cfa46 /quickstep/src | |
| parent | 69998a8c779a20f0d00c0338be3eb7cad943021b (diff) | |
| parent | e7a054ae2b468761d9d0e6dda5645fe859387dcd (diff) | |
Merge "Make sure the correct input consumer is created" into main
Diffstat (limited to 'quickstep/src')
| -rw-r--r-- | quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java index 6710096688..9bf63a0ce7 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java @@ -18,6 +18,7 @@ package com.android.quickstep; import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.view.Display.DEFAULT_DISPLAY; +import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static com.android.launcher3.MotionEventsUtils.isTrackpadScroll; import static com.android.launcher3.util.DisplayController.CHANGE_ALL; @@ -342,6 +343,9 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E * @return whether the given running task info matches the gesture-blocked task. */ public boolean isGestureBlockedTask(CachedTaskInfo taskInfo) { + if (mGestureBlockingTaskId == INVALID_TASK_ID) { + return false; + } if (com.android.wm.shell.Flags.enableShellTopTaskTracking()) { return taskInfo != null && taskInfo.topGroupedTaskContainsTask(mGestureBlockingTaskId); } else { |