summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/Tracks.cpp
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-15 22:35:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-15 22:35:00 +0000
commite80631aa1992ca50af679cd6a018c0ffda7f9b17 (patch)
tree6b3fcc9fbb5b02976e4bb2163e994952303bead5 /services/audioflinger/Tracks.cpp
parentd4a3cae8cc4cf924925ae57723e61c89f6c4fd51 (diff)
parent839d11d1f7be9dff2f06c7d30a9eb39cb6782078 (diff)
downloadframeworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.zip
frameworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.tar.gz
frameworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.tar.bz2
am 839d11d1: Merge changes I0a744dc7,Id993a70d
* commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078': 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 813ec8a..d07113c 100644
--- a/services/audioflinger/Tracks.cpp
+++ b/services/audioflinger/Tracks.cpp
@@ -895,7 +895,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);