diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 52c002d4cc5a..7a43d53d7021 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -2028,7 +2028,7 @@ public final class ActivityStackSupervisor implements DisplayListener { continueUpdateBounds(HOME_STACK_ID); for (int i = mResizingTasksDuringAnimation.size() - 1; i >= 0; i--) { final int taskId = mResizingTasksDuringAnimation.valueAt(i); - if (anyTaskForIdLocked(taskId) != null) { + if (anyTaskForIdLocked(taskId, !RESTORE_FROM_RECENTS, INVALID_STACK_ID) != null) { mWindowManager.setTaskDockedResizing(taskId, false); } } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index a882607cc953..08b7feeed9d2 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -5230,8 +5230,8 @@ public class WindowManagerService extends IWindowManager.Stub synchronized (mWindowMap) { Task task = mTaskIdToTask.get(taskId); if (task == null) { - throw new IllegalArgumentException("setTaskDockedResizing: taskId " + taskId - + " not found."); + Slog.w(TAG, "setTaskDockedResizing: taskId " + taskId + " not found."); + return; } task.setDragResizing(resizing, DRAG_RESIZE_MODE_DOCKED_DIVIDER); } |