commit 5e7409cf6a99da3e6ad792adf949b8963018647f
author Wale Ogunwale <ogunwale@google.com> Mon Jan 11 12:24:19 2016 -0800
committer Wale Ogunwale <ogunwale@google.com> Mon Jan 11 13:07:45 2016 -0800
tree 10e4ad3f8c15a20a27bb503ac43de905631fc912
parent 89a2ed1ef6a4b469c7f795a1656e71dca1ad4b17

Fixed NPE in Task#isResizeableByDockedStack

It is possible for the DisplayContent to be null.

Change-Id: I0a85038ae71a24fb5613237d771bc9222dd61cde

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

diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index b4ddebc..47a4936 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 @@
     }
 
     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);
     }
 
     /**