diff options
| author | Wally Yau <wyau@google.com> | 2015-03-24 20:32:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-24 20:32:28 +0000 |
| commit | 343dad3c1ffdd780bbf247ceebb1f2fd344a5d51 (patch) | |
| tree | ceadcc9efcfd49c7f0674f9dae45d998508e52bc /services | |
| parent | 82ceac025459b5b8887441d709081ec29c6b9416 (diff) | |
| parent | 884de21ca32e4a47f77e541a7284d02054ff3349 (diff) | |
| download | frameworks_av-343dad3c1ffdd780bbf247ceebb1f2fd344a5d51.zip frameworks_av-343dad3c1ffdd780bbf247ceebb1f2fd344a5d51.tar.gz frameworks_av-343dad3c1ffdd780bbf247ceebb1f2fd344a5d51.tar.bz2 | |
Merge "Make sure waitRelative is called when waitTime != INT64_MAX"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audiopolicy/service/AudioPolicyService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ bool AudioPolicyService::AudioCommandThread::threadLoop() 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"); |