diff options
author | Glenn Kasten <gkasten@google.com> | 2014-03-26 18:59:01 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-26 18:59:01 +0000 |
commit | f7f21b93bfce562784ee8f632fb01a2f8e4ffa6b (patch) | |
tree | e5222e0f1f2ff320e83dfe8ef4a068b87be677d0 /media | |
parent | 887bbadb3e1de315c74c905594ee5f2d29a5675c (diff) | |
parent | ebb80e4f9873cc1a5ee3f766323f622bb0c07ae5 (diff) | |
download | frameworks_av-f7f21b93bfce562784ee8f632fb01a2f8e4ffa6b.zip frameworks_av-f7f21b93bfce562784ee8f632fb01a2f8e4ffa6b.tar.gz frameworks_av-f7f21b93bfce562784ee8f632fb01a2f8e4ffa6b.tar.bz2 |
Merge "Remove dead code"
Diffstat (limited to 'media')
-rw-r--r-- | media/libmedia/AudioTrack.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 20c1cdb..62fd7b9 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -371,16 +371,6 @@ status_t AudioTrack::set( mAudioTrackThread->requestExitAndWait(); mAudioTrackThread.clear(); } - // Use of direct and offloaded output streams is ref counted by audio policy manager. -#if 0 // FIXME This should no longer be needed - //Use of direct and offloaded output streams is ref counted by audio policy manager. - // As getOutput was called above and resulted in an output stream to be opened, - // we need to release it. - if (mOutput != 0) { - AudioSystem::releaseOutput(mOutput); - mOutput = 0; - } -#endif return status; } @@ -1775,16 +1765,6 @@ status_t AudioTrack::restoreTrack_l(const char *from) } } if (result != NO_ERROR) { - // Use of direct and offloaded output streams is ref counted by audio policy manager. -#if 0 // FIXME This should no longer be needed - //Use of direct and offloaded output streams is ref counted by audio policy manager. - // As getOutput was called above and resulted in an output stream to be opened, - // we need to release it. - if (mOutput != 0) { - AudioSystem::releaseOutput(mOutput); - mOutput = 0; - } -#endif ALOGW("restoreTrack_l() failed status %d", result); mState = STATE_STOPPED; } |