summaryrefslogtreecommitdiffstats
path: root/services/audioflinger
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-08-30 15:20:56 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-30 15:20:56 -0700
commitc9936c72c128a4a9288424fb082d7e7fe4b9b91f (patch)
tree1c129a891d7bc87be5528b94fb1e58f39ba4f040 /services/audioflinger
parent5dcc2c988eefba1049fe64172bc5fc7e6ee27c8b (diff)
parent7aa25591769685ae0e8349b3ca3534c724484375 (diff)
downloadframeworks_av-c9936c72c128a4a9288424fb082d7e7fe4b9b91f.zip
frameworks_av-c9936c72c128a4a9288424fb082d7e7fe4b9b91f.tar.gz
frameworks_av-c9936c72c128a4a9288424fb082d7e7fe4b9b91f.tar.bz2
Merge "Remove dead code" into jb-mr1-dev
Diffstat (limited to 'services/audioflinger')
-rw-r--r--services/audioflinger/AudioFlinger.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 8acd244..1a37f4f 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -6359,6 +6359,7 @@ bool AudioFlinger::RecordThread::isValidSyncEvent(const sp<SyncEvent>& event) co
status_t AudioFlinger::RecordThread::setSyncEvent(const sp<SyncEvent>& event)
{
+#if 0 // This branch is currently dead code, but is preserved in case it will be needed in future
if (!isValidSyncEvent(event)) {
return BAD_VALUE;
}
@@ -6376,6 +6377,9 @@ status_t AudioFlinger::RecordThread::setSyncEvent(const sp<SyncEvent>& event)
}
}
return ret;
+#else
+ return BAD_VALUE;
+#endif
}
void AudioFlinger::RecordThread::RecordTrack::destroy()