diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-11-21 18:02:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-21 18:02:27 +0000 |
| commit | 23700debf767ef7fdfc30d96612771c3a03ad40d (patch) | |
| tree | 7292c28278f757f51dd1e2a670b7a412b876a211 | |
| parent | 4bdda35319d5f46efea2089b865c8a64816389cd (diff) | |
| parent | 30ff92cba19c5acd747631365db1e1084e45ab34 (diff) | |
| download | frameworks_av-23700debf767ef7fdfc30d96612771c3a03ad40d.zip frameworks_av-23700debf767ef7fdfc30d96612771c3a03ad40d.tar.gz frameworks_av-23700debf767ef7fdfc30d96612771c3a03ad40d.tar.bz2 | |
Merge "Code simplification for timed allocate"
| -rw-r--r-- | services/audioflinger/Tracks.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index d5178b1..272175e 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -1060,11 +1060,8 @@ status_t AudioFlinger::PlaybackThread::TimedTrack::allocateTimedBuffer( } sp<IMemory> newBuffer = mTimedMemoryDealer->allocate(size); - if (newBuffer == NULL) { - newBuffer = mTimedMemoryDealer->allocate(size); - if (newBuffer == NULL) { - return NO_MEMORY; - } + if (newBuffer == 0) { + return NO_MEMORY; } *buffer = newBuffer; |