diff options
| author | 2016-01-11 12:24:19 -0800 | |
|---|---|---|
| committer | 2016-01-11 13:07:45 -0800 | |
| commit | 5e7409cf6a99da3e6ad792adf949b8963018647f (patch) | |
| tree | 10e4ad3f8c15a20a27bb503ac43de905631fc912 | |
| parent | 89a2ed1ef6a4b469c7f795a1656e71dca1ad4b17 (diff) | |
Fixed NPE in Task#isResizeableByDockedStack
It is possible for the DisplayContent to be null.
Change-Id: I0a85038ae71a24fb5613237d771bc9222dd61cde
| -rw-r--r-- | services/core/java/com/android/server/wm/Task.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index b4ddebc7c346..47a4936b144f 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -558,8 +558,9 @@ class Task implements DimLayer.DimLayerUser { } boolean isResizeableByDockedStack() { - return mStack != null && getDisplayContent().getDockedStackLocked() != null && - StackId.isTaskResizeableByDockedStack(mStack.mStackId); + final DisplayContent displayContent = getDisplayContent(); + return displayContent != null && displayContent.getDockedStackLocked() != null + && mStack != null && StackId.isTaskResizeableByDockedStack(mStack.mStackId); } /** |