diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-22 01:49:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 01:49:44 +0000 |
| commit | 9a59d411cbe68d6027c541854c6d7c1348e4ee3d (patch) | |
| tree | d1dba2688eb058cf42c1bf23f100ed7653a7e78a /services | |
| parent | ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e (diff) | |
| parent | 85e6e87c41bba51729cee8958a5c30157c8dc674 (diff) | |
| download | frameworks_av-9a59d411cbe68d6027c541854c6d7c1348e4ee3d.zip frameworks_av-9a59d411cbe68d6027c541854c6d7c1348e4ee3d.tar.gz frameworks_av-9a59d411cbe68d6027c541854c6d7c1348e4ee3d.tar.bz2 | |
am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."
* commit '85e6e87c41bba51729cee8958a5c30157c8dc674':
Restore accidentally-removed NULL timeout.
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/FastMixer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp index 3a3df54..eddde7e 100644 --- a/services/audioflinger/FastMixer.cpp +++ b/services/audioflinger/FastMixer.cpp @@ -179,7 +179,7 @@ bool FastMixer::threadLoop() ALOG_ASSERT(coldFutexAddr != NULL); int32_t old = android_atomic_dec(coldFutexAddr); if (old <= 0) { - (void) syscall(__NR_futex, coldFutexAddr, FUTEX_WAIT_PRIVATE, old - 1); + (void) syscall(__NR_futex, coldFutexAddr, FUTEX_WAIT_PRIVATE, old - 1, NULL); } int policy = sched_getscheduler(0); if (!(policy == SCHED_FIFO || policy == SCHED_RR)) { |