Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ba1d6f3 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge \\\"Make sure task exists in WM before trying to set the resizing... 

Merge \\\"Make sure task exists in WM before trying to set the resizing state\\\" into nyc-dev am: 39647560 am: d0e51b0e
am: 82d04248

Change-Id: I2ca6829b9a65597ffee0e33a27056c0a5f99e898
parents a592bdf4 82d04248

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

+1 −1
Original line number Diff line number Diff line
@@ -2030,7 +2030,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);

            }

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -5236,8 +5236,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);

        }