summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-11-26 12:01:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-26 12:01:49 +0000
commit72215491c60fbcdb9a2f0be782e24e39cca249c5 (patch)
treeac366bd0aad25d9575b19f77a75f23518a8810e8 /media
parentfd2711ca8c9108d25f18b48b924afd925f41344a (diff)
parent1a475921c0577a4650d1bbe40a85b732d1766939 (diff)
downloadframeworks_av-72215491c60fbcdb9a2f0be782e24e39cca249c5.zip
frameworks_av-72215491c60fbcdb9a2f0be782e24e39cca249c5.tar.gz
frameworks_av-72215491c60fbcdb9a2f0be782e24e39cca249c5.tar.bz2
am 1a475921: am 223fd5c9: audio: new routing strategies and stream types
* commit '1a475921c0577a4650d1bbe40a85b732d1766939': audio: new routing strategies and stream types
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 3248adb..4c51646 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -285,7 +285,7 @@ status_t AudioTrack::set(
}
if (pAttributes == NULL) {
- if (uint32_t(streamType) >= AUDIO_STREAM_CNT) {
+ if (uint32_t(streamType) >= AUDIO_STREAM_PUBLIC_CNT) {
ALOGE("Invalid stream type %d", streamType);
return BAD_VALUE;
}