diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-12-03 13:16:38 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-03 13:16:38 -0800 |
| commit | 88bf6084c339fe64ce910a35443ca2d71cfc2f23 (patch) | |
| tree | 698e036fe8736884b56b24910142b3b78a476a77 /services | |
| parent | ad2ff860bfef8d46b02b9093eb606b17b9bdead6 (diff) | |
| parent | 87fc30828209afa25be69ac7053241f4eaeb3378 (diff) | |
| download | frameworks_base-88bf6084c339fe64ce910a35443ca2d71cfc2f23.zip frameworks_base-88bf6084c339fe64ce910a35443ca2d71cfc2f23.tar.gz frameworks_base-88bf6084c339fe64ce910a35443ca2d71cfc2f23.tar.bz2 | |
Merge "Fix issue #3175809: system_server crash with SEGV_MAPERR (IKXEVEREST-1372)"
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/WindowManagerService.java | 8 |
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 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"); + } } } |