am bea98dc2: Merge "Fix inconsistency in LoggingPrintStream."

* commit 'bea98dc245bad71eb3b5fd831218b3db1f75ee21': Fix inconsistency in LoggingPrintStream.
2013-12-10 01:50:59 -08:00
parent 9e61ea4e60 bea98dc245
commit ca9ba160ae
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();