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

Commit 39647560 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 02ab2f52 d6aee18c

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

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

            }

        }

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

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

        }