summaryrefslogtreecommitdiff
path: root/quickstep/src
diff options
context:
space:
mode:
author minch <minch@google.com> 2025-03-20 01:46:23 +0000
committer minch <minch@google.com> 2025-03-24 17:00:28 +0000
commite7a054ae2b468761d9d0e6dda5645fe859387dcd (patch)
treeaa6c0094ec7c8dcf5e4ca0a66b82f4ba3d65769c /quickstep/src
parentf67f97ade2f1345a05e5940b78188dc7d07bec2e (diff)
Make sure the correct input consumer is created
Let `isGestureBlockedTask` return false directly if `mGestureBlockingTaskId` is not valid. This can avoid the caller go to create incorrect InputConsumer when the chekcing `taskId` is also invalid. Bug: 402218420 Flag: EXEMPT bug fix Test: m Change-Id: Ia0cde8ee2b97fc92028458d01487d958f2e87a80
Diffstat (limited to 'quickstep/src')
-rw-r--r--quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java4
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 {