diff options
| author | Eric Laurent <elaurent@google.com> | 2014-09-10 01:58:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-10 01:58:36 +0000 |
| commit | 13f90db44d75313d1eed242a23aaf00b9efa0a68 (patch) | |
| tree | 496033c176254278e153a18f7742407df6894c86 /services | |
| parent | e86697a548f2cef6640bce72c64992bc50213796 (diff) | |
| parent | 5bec1b725df12905e86c35ea142b3a628b266a6c (diff) | |
| download | frameworks_av-13f90db44d75313d1eed242a23aaf00b9efa0a68.zip frameworks_av-13f90db44d75313d1eed242a23aaf00b9efa0a68.tar.gz frameworks_av-13f90db44d75313d1eed242a23aaf00b9efa0a68.tar.bz2 | |
am 5bec1b72: am c99d333f: Merge "audioflinger: fix audio patch release" into lmp-dev
* commit '5bec1b725df12905e86c35ea142b3a628b266a6c':
audioflinger: fix audio patch release
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/PatchPanel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/PatchPanel.cpp b/services/audioflinger/PatchPanel.cpp index 2d0a25f..7544052 100644 --- a/services/audioflinger/PatchPanel.cpp +++ b/services/audioflinger/PatchPanel.cpp @@ -593,10 +593,10 @@ status_t AudioFlinger::PatchPanel::releaseAudioPatch(audio_patch_handle_t handle status = BAD_VALUE; break; } - status = thread->sendReleaseAudioPatchConfigEvent(mPatches[index]->mHalHandle); + status = thread->sendReleaseAudioPatchConfigEvent(removedPatch->mHalHandle); } else { audio_hw_device_t *hwDevice = audioHwDevice->hwDevice(); - status = hwDevice->release_audio_patch(hwDevice, mPatches[index]->mHalHandle); + status = hwDevice->release_audio_patch(hwDevice, removedPatch->mHalHandle); } } else { sp<ThreadBase> thread = audioflinger->checkRecordThread_l( @@ -632,7 +632,7 @@ status_t AudioFlinger::PatchPanel::releaseAudioPatch(audio_patch_handle_t handle } AudioHwDevice *audioHwDevice = audioflinger->mAudioHwDevs.valueAt(index); if (audioHwDevice->version() >= AUDIO_DEVICE_API_VERSION_3_0) { - status = thread->sendReleaseAudioPatchConfigEvent(mPatches[index]->mHalHandle); + status = thread->sendReleaseAudioPatchConfigEvent(removedPatch->mHalHandle); } else { AudioParameter param; param.addInt(String8(AUDIO_PARAMETER_STREAM_ROUTING), 0); |