diff options
| author | Eric Laurent <elaurent@google.com> | 2015-01-20 23:28:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-20 23:28:46 +0000 |
| commit | 1d6aedb3581f1ef2ce9862b1b1d03c9fd3cfff83 (patch) | |
| tree | 21cf75806101a627b4dcaa522c18525f9974d5fe /services/audiopolicy | |
| parent | c10a0a35bfd3c776089403cd2d9a82662189e4a2 (diff) | |
| parent | bf2751a5ea6a306c2ba51a0658ec10aa889a81fa (diff) | |
| download | frameworks_av-1d6aedb3581f1ef2ce9862b1b1d03c9fd3cfff83.zip frameworks_av-1d6aedb3581f1ef2ce9862b1b1d03c9fd3cfff83.tar.gz frameworks_av-1d6aedb3581f1ef2ce9862b1b1d03c9fd3cfff83.tar.bz2 | |
am bf2751a5: am 7ccc6b9b: Merge "fix audio patch leak." into lmp-mr1-dev
* commit 'bf2751a5ea6a306c2ba51a0658ec10aa889a81fa':
fix audio patch leak.
Diffstat (limited to 'services/audiopolicy')
| -rw-r--r-- | services/audiopolicy/AudioPolicyService.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/audiopolicy/AudioPolicyService.cpp b/services/audiopolicy/AudioPolicyService.cpp index b80380e..eb9116d 100644 --- a/services/audiopolicy/AudioPolicyService.cpp +++ b/services/audiopolicy/AudioPolicyService.cpp @@ -908,8 +908,10 @@ void AudioPolicyService::AudioCommandThread::insertCommand_l(sp<AudioCommand>& c } removedCommands.clear(); - // Disable wait for status if delay is not 0 - if (delayMs != 0) { + // Disable wait for status if delay is not 0. + // Except for create audio patch command because the returned patch handle + // is needed by audio policy manager + if (delayMs != 0 && command->mCommand != CREATE_AUDIO_PATCH) { command->mWaitStatus = false; } |