am ca9ba160: am bea98dc2: Merge "Fix inconsistency in LoggingPrintStream."

* commit 'ca9ba160ae8d0b00919298845aceba8b9dc514d0': Fix inconsistency in LoggingPrintStream.
2013-12-10 09:53:00 +00:00
parent ffae30bfe5 ca9ba160ae
commit 57b94b3424
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/os/LoggingPrintStream.java
+++ b/core/java/com/android/internal/os/LoggingPrintStream.java
@@ -293,7 +293,7 @@ abstract class LoggingPrintStream extends PrintStream {

    @Override
    public synchronized void println(String s) {
-        if (builder.length() == 0) {
+        if (builder.length() == 0 && s != null) {
            // Optimization for a simple println.
            int length = s.length();