summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2011-10-13 16:05:27 -0700
committerJason Sams <jsams@google.com>2011-10-13 16:05:27 -0700
commit43b57ec48ec7652addc11bbc9fef652c2394b7f5 (patch)
tree880a57faf0b218858fe9b6123e69e1a3c50e1d46 /libs
parent846601a1627a3be8f87601c13b87a22a6dbfafb4 (diff)
downloadframeworks_base-43b57ec48ec7652addc11bbc9fef652c2394b7f5.zip
frameworks_base-43b57ec48ec7652addc11bbc9fef652c2394b7f5.tar.gz
frameworks_base-43b57ec48ec7652addc11bbc9fef652c2394b7f5.tar.bz2
Fix error printing if no command string is set.
Change-Id: I588c0d0a4e1b8f80c967ebfb6aff179a0cac4a36
Diffstat (limited to 'libs')
-rw-r--r--libs/rs/rsContext.cpp8
1 files changed, 6 insertions, 2 deletions
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::destroyWorkerThreadResources() {
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);
+ }
}