diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-09-16 00:03:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-16 00:03:39 -0700 |
| commit | 398bad04a0ced9dacda185db8af7526002631f62 (patch) | |
| tree | a0141c3f584359535d62ab0f2ede140dceb926c1 | |
| parent | d0c6ccbafdebc73d03cf3cd47f02f9f6c78a69ff (diff) | |
| parent | 5b329e8501486037dd30a5068d96131185893db6 (diff) | |
| download | frameworks_base-398bad04a0ced9dacda185db8af7526002631f62.zip frameworks_base-398bad04a0ced9dacda185db8af7526002631f62.tar.gz frameworks_base-398bad04a0ced9dacda185db8af7526002631f62.tar.bz2 | |
Merge "Fix debug log." into jb-mr1-dev
| -rw-r--r-- | services/java/com/android/server/wm/DisplayContent.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/DisplayContent.java b/services/java/com/android/server/wm/DisplayContent.java index 4df692b..d1742ff 100644 --- a/services/java/com/android/server/wm/DisplayContent.java +++ b/services/java/com/android/server/wm/DisplayContent.java @@ -124,7 +124,9 @@ class DisplayContent { pw.print("-"); pw.print(mDisplayInfo.largestNominalAppWidth); pw.print("x"); pw.println(mDisplayInfo.largestNominalAppHeight); pw.print(" layoutNeeded="); pw.println(layoutNeeded); - pw.print("magnificationSpec="); pw.println(mMagnificationSpec); + if (mMagnificationSpec != null) { + pw.print(" mMagnificationSpec="); pw.println(mMagnificationSpec); + } pw.println(); } } |