summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/Threads.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-09-24 11:52:37 -0700
committerGlenn Kasten <gkasten@google.com>2014-03-14 14:49:37 -0700
commit15e5798908ccac14e10c84834eaf08c42931bd06 (patch)
treea5f72fd4a8d0a73477d88cef7161a97d3754665c /services/audioflinger/Threads.cpp
parent570f633e0b02d1bc25f3312b92e72cc29a40ca38 (diff)
downloadframeworks_av-15e5798908ccac14e10c84834eaf08c42931bd06.zip
frameworks_av-15e5798908ccac14e10c84834eaf08c42931bd06.tar.gz
frameworks_av-15e5798908ccac14e10c84834eaf08c42931bd06.tar.bz2
Make error handling for audio driver initCheck more similar
Change-Id: I8222f00f7ac89d52235af0f64f3fee7a8c471e1e
Diffstat (limited to 'services/audioflinger/Threads.cpp')
-rw-r--r--services/audioflinger/Threads.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index f7cd926..12d453e 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -1384,7 +1384,7 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac
lStatus = initCheck();
if (lStatus != NO_ERROR) {
- ALOGE("Audio driver not initialized.");
+ ALOGE("createTrack_l() audio driver not initialized");
goto Exit;
}
@@ -5077,12 +5077,6 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe
sp<RecordTrack> track;
status_t lStatus;
- lStatus = initCheck();
- if (lStatus != NO_ERROR) {
- ALOGE("createRecordTrack_l() audio driver not initialized");
- goto Exit;
- }
-
// client expresses a preference for FAST, but we get the final say
if (*flags & IAudioFlinger::TRACK_FAST) {
if (
@@ -5135,7 +5129,11 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe
}
*pFrameCount = frameCount;
- // FIXME use flags and tid similar to createTrack_l()
+ lStatus = initCheck();
+ if (lStatus != NO_ERROR) {
+ ALOGE("createRecordTrack_l() audio driver not initialized");
+ goto Exit;
+ }
{ // scope for mLock
Mutex::Autolock _l(mLock);