commit 3fda6ed3c751d959d93dc9fb6d3b65f3617d04f5
author Jason Sams <jsams@google.com> Thu Oct 13 16:13:07 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 13 16:13:07 2011 -0700
tree 28302e7360c85e8a680eab564bd3fdc616e89c17
parent bb290c891ef51d83c5fd855e24f1c74cdc182fef
parent 43b57ec48ec7652addc11bbc9fef652c2394b7f5

am 43b57ec4: Fix error printing if no command string is set.

* commit '43b57ec48ec7652addc11bbc9fef652c2394b7f5':
  Fix error printing if no command string is set.

libs/rs/rsContext.cpp

diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index 53d4970..2d51208 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -319,8 +319,12 @@
 
 void Context::printWatchdogInfo(void *ctx) {
     Context *rsc = (Context *)ctx;
-    LOGE("RS watchdog timeout: %i  %s  line %i %s", rsc->watchdog.inRoot,
-         rsc->watchdog.command, rsc->watchdog.line, rsc->watchdog.file);
+    if (rsc->watchdog.command && rsc->watchdog.file) {
+        LOGE("RS watchdog timeout: %i  %s  line %i %s", rsc->watchdog.inRoot,
+             rsc->watchdog.command, rsc->watchdog.line, rsc->watchdog.file);
+    } else {
+        LOGE("RS watchdog timeout: %i", rsc->watchdog.inRoot);
+    }
 }