summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/os/LoggingPrintStream.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/LoggingPrintStream.java b/core/java/com/android/internal/os/LoggingPrintStream.java
index 451340b463ef..f14394ad09ce 100644
--- 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();