Merge "Fix issue #3175809: system_server crash with SEGV_MAPERR (IKXEVEREST-1372)"

1 files changed, 6 insertions, 2 deletions

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 7504bb42cf01..2d88b2f97bc5 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -11344,8 +11344,12 @@ public class WindowManagerService extends IWindowManager.Stub
             if (mToBottomApps.size() > 0) {
                 pw.print("  mToBottomApps="); pw.println(mToBottomApps);
             }
-            pw.print("  DisplayWidth="); pw.print(mDisplay.getWidth());
-                    pw.print(" DisplayHeight="); pw.println(mDisplay.getHeight());
+            if (mDisplay != null) {
+                pw.print("  DisplayWidth="); pw.print(mDisplay.getWidth());
+                        pw.print(" DisplayHeight="); pw.println(mDisplay.getHeight());
+            } else {
+                pw.println("  NO DISPLAY");
+            }
         }
     }