commit 87fc30828209afa25be69ac7053241f4eaeb3378
author Dianne Hackborn <hackbod@google.com> Fri Dec 03 13:09:12 2010 -0800
committer Dianne Hackborn <hackbod@google.com> Fri Dec 03 13:09:12 2010 -0800
tree 92a3964b0d53255a62504e92c076bd51c3fbc9b8
parent 189ee18d6c6483ad63cc864267328259e2e00b95

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

Don't crash if dump() is called before we have set mDisplay.

Change-Id: I0d3d356ff27dbc61353a5b99e348178937d5f4a5

services/java/com/android/server/WindowManagerService.java

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 7504bb4..2d88b2f 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -11344,8 +11344,12 @@
             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");
+            }
         }
     }