summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/Tracks.cpp
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-15 23:37:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-15 23:37:19 +0000
commit1b24cf32e02a1372e57b3a2a432bc0adfe496e6d (patch)
tree220f4583ae1081df62fa5c861eed3e9e90a24515 /services/audioflinger/Tracks.cpp
parent4845b69f70ff457be8d8908f6eb61e2af67e00d3 (diff)
parente80631aa1992ca50af679cd6a018c0ffda7f9b17 (diff)
downloadframeworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.zip
frameworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.tar.gz
frameworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.tar.bz2
am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d
* commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
Diffstat (limited to 'services/audioflinger/Tracks.cpp')
-rw-r--r--services/audioflinger/Tracks.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp
index 2cf10e2..1064fd1 100644
--- a/services/audioflinger/Tracks.cpp
+++ b/services/audioflinger/Tracks.cpp
@@ -930,7 +930,7 @@ bool AudioFlinger::PlaybackThread::Track::presentationComplete(size_t framesWrit
void AudioFlinger::PlaybackThread::Track::triggerEvents(AudioSystem::sync_event_t type)
{
- for (int i = 0; i < (int)mSyncEvents.size(); i++) {
+ for (size_t i = 0; i < mSyncEvents.size(); i++) {
if (mSyncEvents[i]->type() == type) {
mSyncEvents[i]->trigger();
mSyncEvents.removeAt(i);