diff options
| author | Eric Laurent <elaurent@google.com> | 2015-04-22 16:03:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-22 16:03:15 +0000 |
| commit | d54514d5e4b326e5dcaaf8b3f336ef31e447f355 (patch) | |
| tree | b6d200da17ca080209815c8c272a37f91826e7c8 /media | |
| parent | 0dd229bb306df68b88e7419b3cc11fc6175be1da (diff) | |
| parent | 493404d8c396e15ed73455acd39aa0f1940996e2 (diff) | |
| download | frameworks_av-d54514d5e4b326e5dcaaf8b3f336ef31e447f355.zip frameworks_av-d54514d5e4b326e5dcaaf8b3f336ef31e447f355.tar.gz frameworks_av-d54514d5e4b326e5dcaaf8b3f336ef31e447f355.tar.bz2 | |
Merge "audio policy: fix AudioTrack output device selection"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 055556f..7869a84 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -1014,10 +1014,9 @@ status_t AudioTrack::setOutputDevice(audio_port_handle_t deviceId) { AutoMutex lock(mLock); if (mSelectedDeviceId != deviceId) { mSelectedDeviceId = deviceId; - return restoreTrack_l("setOutputDevice() restart"); - } else { - return NO_ERROR; + android_atomic_or(CBLK_INVALID, &mCblk->mFlags); } + return NO_ERROR; } audio_port_handle_t AudioTrack::getOutputDevice() { |