Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Short-term fix for unregistered JNI method"

Browse Source
This commit is contained in:
Glenn Kasten
2016-01-07 18:58:56 +00:00
committed by Android (Google) Code Review
parent 08c5ad4336 7922be86e2
commit 8c04e18c9a
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/jni/android_media_AudioTrack.cpp
View File

@@ -1049,9 +1049,12 @@ static void android_media_AudioTrack_disableDeviceCallback(
pJniStorage->mDeviceCallback.clear();
}
// FIXME
#if 0
static jint android_media_AudioTrack_get_FCC_8(JNIEnv *env, jobject thiz) {
return FCC_8;
}
#endif
// ----------------------------------------------------------------------------
@@ -1110,7 +1113,7 @@ static const JNINativeMethod gMethods[] = {
{"native_getRoutedDeviceId", "()I", (void *)android_media_AudioTrack_getRoutedDeviceId},
{"native_enableDeviceCallback", "()V", (void *)android_media_AudioTrack_enableDeviceCallback},
{"native_disableDeviceCallback", "()V", (void *)android_media_AudioTrack_disableDeviceCallback},
{"native_get_FCC_8", "()I", (void *)android_media_AudioTrack_get_FCC_8},
// FIXME {"native_get_FCC_8", "()I", (void *)android_media_AudioTrack_get_FCC_8},
};

4
media/java/android/media/AudioTrack.java
View File

@@ -100,7 +100,7 @@ public class AudioTrack
/** Maximum value for AudioTrack channel count
* @hide public for MediaCode only, do not un-hide or change to a numeric literal
*/
public static final int CHANNEL_COUNT_MAX = native_get_FCC_8();
public static final int CHANNEL_COUNT_MAX = 8; // FIXME was native_get_FCC_8(), unregistered!
/** indicates AudioTrack state is stopped */
public static final int PLAYSTATE_STOPPED = 1; // matches SL_PLAYSTATE_STOPPED
@@ -2584,7 +2584,7 @@ public class AudioTrack
private native final int native_getRoutedDeviceId();
private native final void native_enableDeviceCallback();
private native final void native_disableDeviceCallback();
static private native int native_get_FCC_8();
// FIXME static private native int native_get_FCC_8();
//---------------------------------------------------------
// Utility methods