diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-21 18:01:17 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-05-21 18:01:17 -0700 |
| commit | 9382378b6b271949bdce527ea3da748c13c4c692 (patch) | |
| tree | 9b20c4e7b8e8dc733937f9125cd22b4c11c046a7 /services/audioflinger/Tracks.cpp | |
| parent | d83062287758be57d1d0908b30bb18aa9b367f38 (diff) | |
| parent | b108091734ee7668084cc1063187c2b10ddb7bb7 (diff) | |
| download | frameworks_av-9382378b6b271949bdce527ea3da748c13c4c692.zip frameworks_av-9382378b6b271949bdce527ea3da748c13c4c692.tar.gz frameworks_av-9382378b6b271949bdce527ea3da748c13c4c692.tar.bz2 | |
resolved conflicts for merge of b1080917 to master
Change-Id: Iabbe3e95e29f28461ff722b550e8a9f35bd2528f
Diffstat (limited to 'services/audioflinger/Tracks.cpp')
| -rw-r--r-- | services/audioflinger/Tracks.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index de1782d..68b86f4 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -1008,7 +1008,7 @@ void AudioFlinger::PlaybackThread::Track::invalidate() android_atomic_or(CBLK_INVALID, &cblk->mFlags); android_atomic_release_store(0x40000000, &cblk->mFutex); // client is not in server, so FUTEX_WAKE is needed instead of FUTEX_WAKE_PRIVATE - (void) __futex_syscall3(&cblk->mFutex, FUTEX_WAKE, INT_MAX); + (void) __futex_syscall4(&cblk->mFutex, FUTEX_WAKE, INT_MAX, NULL); mIsInvalid = true; } @@ -1937,7 +1937,7 @@ void AudioFlinger::RecordThread::RecordTrack::invalidate() android_atomic_or(CBLK_INVALID, &cblk->mFlags); android_atomic_release_store(0x40000000, &cblk->mFutex); // client is not in server, so FUTEX_WAKE is needed instead of FUTEX_WAKE_PRIVATE - (void) __futex_syscall3(&cblk->mFutex, FUTEX_WAKE, INT_MAX); + (void) __futex_syscall4(&cblk->mFutex, FUTEX_WAKE, INT_MAX, NULL); } |