From 87fc30828209afa25be69ac7053241f4eaeb3378 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Fri, 3 Dec 2010 13:09:12 -0800
Subject: 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 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'services')

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 @@ 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");
+            }
         }
     }
 
-- 
cgit v1.1