summaryrefslogtreecommitdiffstats
path: root/core/jni/android_media_AudioSystem.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-17 11:32:53 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-17 11:32:53 -0800
commitfb6b5bdcea04c1fa6ccd046373f5ad3a62784713 (patch)
treee41dc95066a917ab9767d84d3a449ff7361ec520 /core/jni/android_media_AudioSystem.cpp
parentf56945e06aed28041f0f370c26b4b8986033c489 (diff)
parentaccb114e59ca51f2a7d370f64de8e98bde158c51 (diff)
downloadframeworks_base-fb6b5bdcea04c1fa6ccd046373f5ad3a62784713.zip
frameworks_base-fb6b5bdcea04c1fa6ccd046373f5ad3a62784713.tar.gz
frameworks_base-fb6b5bdcea04c1fa6ccd046373f5ad3a62784713.tar.bz2
Merge "Use audio_mode_t consistently"
Diffstat (limited to 'core/jni/android_media_AudioSystem.cpp')
-rw-r--r--core/jni/android_media_AudioSystem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index 29f9d54..d0b5ade 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -152,7 +152,7 @@ android_media_AudioSystem_getDeviceConnectionState(JNIEnv *env, jobject thiz, ji
static int
android_media_AudioSystem_setPhoneState(JNIEnv *env, jobject thiz, jint state)
{
- return check_AudioSystem_Command(AudioSystem::setPhoneState(state));
+ return check_AudioSystem_Command(AudioSystem::setPhoneState((audio_mode_t) state));
}
static int