summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-12-14 15:05:56 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-12-14 15:05:56 -0800
commit2135dad4a542e4702e4b2d87f0eb05571ff64b57 (patch)
treef734fc4ddf2ad970b3d0c807cbe754e3c68889dd /media
parent2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c (diff)
parentf0c495012bad92230604a9a12a907812ec49ee8f (diff)
downloadframeworks_av-2135dad4a542e4702e4b2d87f0eb05571ff64b57.zip
frameworks_av-2135dad4a542e4702e4b2d87f0eb05571ff64b57.tar.gz
frameworks_av-2135dad4a542e4702e4b2d87f0eb05571ff64b57.tar.bz2
Merge "AudioTrack::setVolume check range"
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/AudioTrack.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 7e55fbd..eca659f 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -477,7 +477,7 @@ bool AudioTrack::muted() const
status_t AudioTrack::setVolume(float left, float right)
{
- if (left > 1.0f || right > 1.0f) {
+ if (left < 0.0f || left > 1.0f || right < 0.0f || right > 1.0f) {
return BAD_VALUE;
}