summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-07-16 08:27:30 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-16 08:27:30 -0700
commitdcda3b325f465aa6ec2be11db1c56c8a5e867f33 (patch)
tree0f7709ccea7f3c3cb5a63747adb7d5bfb82e194a
parent2bdb2f25861f3a3ac9cf3b7af561975fc9b9eead (diff)
parentd64cd233eef39430561c1e1df423336a199cc5d7 (diff)
downloadframeworks_av-dcda3b325f465aa6ec2be11db1c56c8a5e867f33.zip
frameworks_av-dcda3b325f465aa6ec2be11db1c56c8a5e867f33.tar.gz
frameworks_av-dcda3b325f465aa6ec2be11db1c56c8a5e867f33.tar.bz2
Merge "AudioRecord::stop() return void"
-rw-r--r--include/media/AudioRecord.h2
-rw-r--r--media/libmedia/AudioRecord.cpp4
2 files changed, 2 insertions, 4 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h
index f7ebd39..7e66ac9 100644
--- a/include/media/AudioRecord.h
+++ b/include/media/AudioRecord.h
@@ -201,7 +201,7 @@ public:
* obtainBuffer returns STOPPED. Note that obtainBuffer() still works
* and will fill up buffers until the pool is exhausted.
*/
- status_t stop();
+ void stop();
bool stopped() const;
/* get sample rate for this record track
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index 807f812..9d5813b 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -324,7 +324,7 @@ status_t AudioRecord::start(AudioSystem::sync_event_t event, int triggerSession)
return ret;
}
-status_t AudioRecord::stop()
+void AudioRecord::stop()
{
sp<AudioRecordThread> t = mAudioRecordThread;
@@ -345,8 +345,6 @@ status_t AudioRecord::stop()
set_sched_policy(0, mPreviousSchedulingGroup);
}
}
-
- return NO_ERROR;
}
bool AudioRecord::stopped() const