summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioWatchdog.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-07-15 11:23:36 -0700
committerGlenn Kasten <gkasten@google.com>2013-07-19 09:30:37 -0700
commit153b9fe667e6e78e0218ff0159353097428c7657 (patch)
tree360a76911071e362a94af32ccf67ce9619629708 /services/audioflinger/AudioWatchdog.cpp
parent20f4754b7e687d3718a0a0a585f2c9ac22e2567d (diff)
downloadframeworks_av-153b9fe667e6e78e0218ff0159353097428c7657.zip
frameworks_av-153b9fe667e6e78e0218ff0159353097428c7657.tar.gz
frameworks_av-153b9fe667e6e78e0218ff0159353097428c7657.tar.bz2
Make AudioFlinger::instantiate() more resilient when called from separate module
Bug: 8834855 Change-Id: I4cd842cdfb09d2aaaaab9df9ac3bec6179709bd3
Diffstat (limited to 'services/audioflinger/AudioWatchdog.cpp')
-rw-r--r--services/audioflinger/AudioWatchdog.cpp5
1 files changed, 5 insertions, 0 deletions
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 @@ void AudioWatchdog::setDump(AudioWatchdogDump *dump)
}
} // namespace android
+
+#endif // AUDIO_WATCHDOG