diff options
| author | Eric Laurent <elaurent@google.com> | 2015-05-06 17:51:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-06 17:51:53 +0000 |
| commit | b65cd17b0508a5a7afdd92e69437825071a1631b (patch) | |
| tree | c727a8fe013d5eb6135bd6e4f453e9ee262a35ad /core/jni/android_media_AudioSystem.cpp | |
| parent | 6223ec129b256526d8c30920271b2ee3960bcf1f (diff) | |
| parent | 4bcdba848449b33d7022de527c526943aff1f5fd (diff) | |
| download | frameworks_base-b65cd17b0508a5a7afdd92e69437825071a1631b.zip frameworks_base-b65cd17b0508a5a7afdd92e69437825071a1631b.tar.gz frameworks_base-b65cd17b0508a5a7afdd92e69437825071a1631b.tar.bz2 | |
Merge "Implement audio routing callbacks" into mnc-dev
Diffstat (limited to 'core/jni/android_media_AudioSystem.cpp')
| -rw-r--r-- | core/jni/android_media_AudioSystem.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index 3655adc..eab5668 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -937,7 +937,8 @@ static jint convertAudioPortFromNative(JNIEnv *env, } else if (nAudioPort->type == AUDIO_PORT_TYPE_MIX) { ALOGV("convertAudioPortFromNative is a mix"); *jAudioPort = env->NewObject(gAudioMixPortClass, gAudioMixPortCstor, - jHandle, nAudioPort->role, jDeviceName, + jHandle, nAudioPort->ext.mix.handle, + nAudioPort->role, jDeviceName, jSamplingRates, jChannelMasks, jFormats, jGains); } else { @@ -1670,7 +1671,7 @@ int register_android_media_AudioSystem(JNIEnv *env) jclass audioMixPortClass = FindClassOrDie(env, "android/media/AudioMixPort"); gAudioMixPortClass = MakeGlobalRefOrDie(env, audioMixPortClass); gAudioMixPortCstor = GetMethodIDOrDie(env, audioMixPortClass, "<init>", - "(Landroid/media/AudioHandle;ILjava/lang/String;[I[I[I[Landroid/media/AudioGain;)V"); + "(Landroid/media/AudioHandle;IILjava/lang/String;[I[I[I[Landroid/media/AudioGain;)V"); jclass audioGainClass = FindClassOrDie(env, "android/media/AudioGain"); gAudioGainClass = MakeGlobalRefOrDie(env, audioGainClass); |