diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-06-23 09:00:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-23 09:00:03 -0700 |
| commit | db262e6cf072a0ebbf2b67aceb37ce9d5ba87b08 (patch) | |
| tree | d64b8d37d1d1f0379233df0b63a6266a72aafdea | |
| parent | e847fc24c3136efc003b5bfc49a5054fe55f6e57 (diff) | |
| parent | 028ab996e50a3a6a5c6dde88f9b2cc5d2f354654 (diff) | |
| download | frameworks_base-db262e6cf072a0ebbf2b67aceb37ce9d5ba87b08.zip frameworks_base-db262e6cf072a0ebbf2b67aceb37ce9d5ba87b08.tar.gz frameworks_base-db262e6cf072a0ebbf2b67aceb37ce9d5ba87b08.tar.bz2 | |
Merge "Fix warnings for uninitialized local variables"
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 2 | ||||
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index 03518bf..4c4aad0 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -481,7 +481,7 @@ status_t AudioRecord::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; 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; |