summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Glenn Kasten <gkasten@google.com> 2012-01-11 10:01:34 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-01-11 10:01:34 -0800
commitbb8d6fb4fc272ee2eb69b69e5149f81c95b79818 (patch)
tree5c39e00040a50b9dde3fbd6be38d48821d6b05ff
parent81754949e0110b9db44bef421d6282a3bf831138 (diff)
parentadda27acae4a8d6907399aa124657e9e77051b72 (diff)
Merge "Fix build warning"
-rw-r--r--services/audioflinger/AudioMixer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp
index 8df4605dcb0f..a8102e5fffd0 100644
--- a/services/audioflinger/AudioMixer.cpp
+++ b/services/audioflinger/AudioMixer.cpp
@@ -309,7 +309,7 @@ void AudioMixer::track_t::resetResampler()
inline
void AudioMixer::track_t::adjustVolumeRamp(bool aux)
{
- for (int i=0 ; i<MAX_NUM_CHANNELS ; i++) {
+ for (uint32_t i=0 ; i<MAX_NUM_CHANNELS ; i++) {
if (((volumeInc[i]>0) && (((prevVolume[i]+volumeInc[i])>>16) >= volume[i])) ||
((volumeInc[i]<0) && (((prevVolume[i]+volumeInc[i])>>16) <= volume[i]))) {
volumeInc[i] = 0;