summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioTrack.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-06-23 09:00:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-23 09:00:03 -0700
commitdb262e6cf072a0ebbf2b67aceb37ce9d5ba87b08 (patch)
treed64b8d37d1d1f0379233df0b63a6266a72aafdea /media/libmedia/AudioTrack.cpp
parente847fc24c3136efc003b5bfc49a5054fe55f6e57 (diff)
parent028ab996e50a3a6a5c6dde88f9b2cc5d2f354654 (diff)
downloadframeworks_base-db262e6cf072a0ebbf2b67aceb37ce9d5ba87b08.zip
frameworks_base-db262e6cf072a0ebbf2b67aceb37ce9d5ba87b08.tar.gz
frameworks_base-db262e6cf072a0ebbf2b67aceb37ce9d5ba87b08.tar.bz2
Merge "Fix warnings for uninitialized local variables"
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
-rw-r--r--media/libmedia/AudioTrack.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 5172809..31eb97a 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -314,7 +314,7 @@ sp<IMemory>& AudioTrack::sharedBuffer()
void AudioTrack::start()
{
sp<AudioTrackThread> t = mAudioTrackThread;
- status_t status;
+ status_t status = NO_ERROR;
LOGV("start %p", this);
if (t != 0) {
@@ -825,7 +825,7 @@ status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, int32_t waitCount)
{
AutoMutex lock(mLock);
int active;
- status_t result;
+ status_t result = NO_ERROR;
audio_track_cblk_t* cblk = mCblk;
uint32_t framesReq = audioBuffer->frameCount;
uint32_t waitTimeMs = (waitCount < 0) ? cblk->bufferTimeoutMs : WAIT_PERIOD_MS;