summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2015-01-20 21:09:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-20 21:09:54 +0000
commit7ccc6b9baf2f568a0a8c6e27dcd4195645a6361d (patch)
treeb4d2dfaf0b4fb59655c34d21ca61a890f594f83d /services/audiopolicy
parent4d4ea7f7ca04cfe70ecf6f35658389f52ae6d3c1 (diff)
parentaa79befb301bc3451a19021b3fc9e9e6a1f231e8 (diff)
downloadframeworks_av-7ccc6b9baf2f568a0a8c6e27dcd4195645a6361d.zip
frameworks_av-7ccc6b9baf2f568a0a8c6e27dcd4195645a6361d.tar.gz
frameworks_av-7ccc6b9baf2f568a0a8c6e27dcd4195645a6361d.tar.bz2
Merge "fix audio patch leak." into lmp-mr1-dev
Diffstat (limited to 'services/audiopolicy')
-rw-r--r--services/audiopolicy/AudioPolicyService.cpp6
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;
}