commit | f391ebccea9090fac64201d284641be3882f857a | [log] [tgz] |
---|---|---|
author | Chad Jones <chadj@google.com> | Thu Jun 12 17:45:05 2014 -0700 |
committer | Chad Jones <chadj@google.com> | Thu Jun 12 17:45:05 2014 -0700 |
tree | c004426b535cdc507d439eef3d09b9d62946efdf | |
parent | 221748039c74215192e9e538a5d05f601b441242 [diff] [blame] | |
parent | 4849aa86b1f26c12d036f32fa5b1413cecd77760 [diff] [blame] |
resolved conflicts for merge of 4849aa86 to master Change-Id: I7ec55bdb7a3a1618f33dfdb3b19b2bd201789677
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 97178bd..7003c8c 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -728,8 +728,11 @@ } public DisplayContent getDisplayContent() { - return mAppToken == null || mNotOnAppsDisplay ? - mDisplayContent : getStack().getDisplayContent(); + if (mAppToken == null || mNotOnAppsDisplay) { + return mDisplayContent; + } + final TaskStack stack = getStack(); + return stack == null ? mDisplayContent : stack.getDisplayContent(); } public int getDisplayId() {