commit 153b9fe667e6e78e0218ff0159353097428c7657
author Glenn Kasten <gkasten@google.com> Mon Jul 15 11:23:36 2013 -0700
committer Glenn Kasten <gkasten@google.com> Fri Jul 19 09:30:37 2013 -0700
tree 360a76911071e362a94af32ccf67ce9619629708
parent 20f4754b7e687d3718a0a0a585f2c9ac22e2567d

Make AudioFlinger::instantiate() more resilient when called from separate module

Bug: 8834855
Change-Id: I4cd842cdfb09d2aaaaab9df9ac3bec6179709bd3

services/audioflinger/AudioWatchdog.cpp

diff --git a/services/audioflinger/AudioWatchdog.cpp b/services/audioflinger/AudioWatchdog.cpp
index 8f328ee..93d185e 100644
--- a/services/audioflinger/AudioWatchdog.cpp
+++ b/services/audioflinger/AudioWatchdog.cpp
@@ -17,9 +17,12 @@
 #define LOG_TAG "AudioWatchdog"
 //#define LOG_NDEBUG 0
 
+#include "Configuration.h"
 #include <utils/Log.h>
 #include "AudioWatchdog.h"
 
+#ifdef AUDIO_WATCHDOG
+
 namespace android {
 
 void AudioWatchdogDump::dump(int fd)
@@ -132,3 +135,5 @@
 }
 
 }   // namespace android
+
+#endif // AUDIO_WATCHDOG