Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-14 23:05:49 +00:00
committed by Android (Google) Code Review
parent 02ab2f52bf d6aee18cab
commit 39647560d1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -2028,7 +2028,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
continueUpdateBounds(HOME_STACK_ID); continueUpdateBounds(HOME_STACK_ID);
for (int i = mResizingTasksDuringAnimation.size() - 1; i >= 0; i--) { for (int i = mResizingTasksDuringAnimation.size() - 1; i >= 0; i--) {
final int taskId = mResizingTasksDuringAnimation.valueAt(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); mWindowManager.setTaskDockedResizing(taskId, false);
} }
} }

4
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -5230,8 +5230,8 @@ public class WindowManagerService extends IWindowManager.Stub
synchronized (mWindowMap) { synchronized (mWindowMap) {
Task task = mTaskIdToTask.get(taskId); Task task = mTaskIdToTask.get(taskId);
if (task == null) { if (task == null) {
throw new IllegalArgumentException("setTaskDockedResizing: taskId " + taskId Slog.w(TAG, "setTaskDockedResizing: taskId " + taskId + " not found.");
+ " not found."); return;
} }
task.setDragResizing(resizing, DRAG_RESIZE_MODE_DOCKED_DIVIDER); task.setDragResizing(resizing, DRAG_RESIZE_MODE_DOCKED_DIVIDER);
} }