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

Merge "Fix bogus warning in startResizingTask"

Browse Source
This commit is contained in:
Chong Zhang
2015-10-12 19:19:51 +00:00
committed by Android (Google) Code Review
parent dbb478dc7a fe98b064bc
commit 25ad8e7ea3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
}