diff options
| author | Eric Laurent <elaurent@google.com> | 2015-01-20 21:13:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-20 21:13:58 +0000 |
| commit | bf2751a5ea6a306c2ba51a0658ec10aa889a81fa (patch) | |
| tree | b4d2dfaf0b4fb59655c34d21ca61a890f594f83d /services/audiopolicy | |
| parent | 9e308de9214e55dd0d102484ea44b117ec050540 (diff) | |
| parent | 7ccc6b9baf2f568a0a8c6e27dcd4195645a6361d (diff) | |
| download | frameworks_av-bf2751a5ea6a306c2ba51a0658ec10aa889a81fa.zip frameworks_av-bf2751a5ea6a306c2ba51a0658ec10aa889a81fa.tar.gz frameworks_av-bf2751a5ea6a306c2ba51a0658ec10aa889a81fa.tar.bz2 | |
am 7ccc6b9b: Merge "fix audio patch leak." into lmp-mr1-dev
* commit '7ccc6b9baf2f568a0a8c6e27dcd4195645a6361d':
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 8a9abc9..0955e10 100644 --- a/services/audiopolicy/AudioPolicyService.cpp +++ b/services/audiopolicy/AudioPolicyService.cpp @@ -907,8 +907,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; } |