commit 39647560d1e3b85f5bc92a9a464ba63b44faad3e
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 14 23:05:49 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 14 23:05:50 2016 +0000
tree 60d15fb3cdbbcbb788c88f8057ecbbffbfbe9215
parent 02ab2f52bfadfc3ef652cfdcd8c8de79a75e2952
parent d6aee18cabe75cbd4e98bfa380dffb89d89e0efc

Merge "Make sure task exists in WM before trying to set the resizing state" into nyc-dev

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 52c002d..7a43d53 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 @@
         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);
             }
         }

services/core/java/com/android/server/wm/WindowManagerService.java

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index a882607..08b7fee 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 @@
         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);
         }