From fe98b064bcf15f702027ece574787b0b8eb4ca20 Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Mon, 12 Oct 2015 11:58:19 -0700 Subject: [PATCH] Fix bogus warning in startResizingTask win will be null if no window is found for resizing which is normal. bug: 24814867 Change-Id: I16fc55af62b8f90643a3e85ca6d741db92fae958 --- .../core/java/com/android/server/wm/WindowManagerService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 0170bb9655408..0932f1570751f 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -6875,6 +6875,8 @@ public class WindowManagerService extends IWindowManager.Stub WindowState win = null; synchronized (mWindowMap) { win = windowForClientLocked(null, window, false); + // win shouldn't be null here, pass it down to startPositioningLocked + // to get warning if it's null. if (!startPositioningLocked(win, false /*resize*/, startX, startY)) { return false; } @@ -6889,7 +6891,7 @@ public class WindowManagerService extends IWindowManager.Stub WindowState win = null; synchronized (mWindowMap) { win = displayContent.findWindowForControlPoint(startX, startY); - if (!startPositioningLocked(win, true /*resize*/, startX, startY)) { + if (win == null || !startPositioningLocked(win, true /*resize*/, startX, startY)) { return; } }