commit eaa59b1ace87d3171920da757c81f424166a93c6
author Craig Mautner <cmautner@google.com> Thu Oct 02 20:18:34 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 02 20:18:34 2014 +0000
tree 7d47f9d584e31b800c46641ebf954d98b2921095
parent 8f99ebb1c9671a35b956b8ec7b43179ffbf3703c
parent 9dfad8c7f01e8a69989d1c44deb8a621216a0d9f

am 9dfad8c7: Merge "Remove misleading error log." into lmp-dev

* commit '9dfad8c7f01e8a69989d1c44deb8a621216a0d9f':
  Remove misleading error log.

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

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 0c51160..30589b1 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -162,7 +162,7 @@
     }
 
     TaskStack getHomeStack() {
-        if (mHomeStack == null) {
+        if (mHomeStack == null && mDisplayId == Display.DEFAULT_DISPLAY) {
             Slog.e(TAG, "getHomeStack: Returning null from this=" + this);
         }
         return mHomeStack;