commit 3f603dadd7e34891d215cec8ba35ab838e70185a
author Eric Laurent <elaurent@google.com> Tue Jan 20 23:37:18 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 20 23:37:18 2015 +0000
tree b3ac0d9534f7474286d55400cd54c2fb777218a3
parent 35d86b96d938a5680c8b70a6f985e23b2631dd0e
parent 1d6aedb3581f1ef2ce9862b1b1d03c9fd3cfff83

am 1d6aedb3: am bf2751a5: am 7ccc6b9b: Merge "fix audio patch leak." into lmp-mr1-dev

* commit '1d6aedb3581f1ef2ce9862b1b1d03c9fd3cfff83':
  fix audio patch leak.

services/audiopolicy/AudioPolicyService.cpp

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 @@
     }
     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;
     }