commit 884de21ca32e4a47f77e541a7284d02054ff3349
author Wally Yau <wyau@google.com> Tue Mar 24 09:10:58 2015 -0700
committer Wally Yau <wyau@google.com> Tue Mar 24 09:10:58 2015 -0700
tree d7371afc5d731f607281909dc090cb36950911b2
parent ec648447b7dcab701c436a54bd38a1abd8037be1

Make sure waitRelative is called when waitTime != INT64_MAX

b/19870971

(cherry picked from commit c600af1459c455583e071e653f0d998032aa423e)

Change-Id: Ic6bb54067d76c96ff6fc45431dc2d72db9f0a3a8

services/audiopolicy/service/AudioPolicyService.cpp

diff --git a/services/audiopolicy/service/AudioPolicyService.cpp b/services/audiopolicy/service/AudioPolicyService.cpp
index eb9116d..00f188f 100644
--- a/services/audiopolicy/service/AudioPolicyService.cpp
+++ b/services/audiopolicy/service/AudioPolicyService.cpp
@@ -532,7 +532,7 @@
         mLock.unlock();
         svc.clear();
         mLock.lock();
-        if (!exitPending() && mAudioCommands.isEmpty()) {
+        if (!exitPending() && (mAudioCommands.isEmpty() || waitTime != INT64_MAX)) {
             // release delayed commands wake lock
             release_wake_lock(mName.string());
             ALOGV("AudioCommandThread() going to sleep");