diff options
| author | 2016-01-07 10:59:35 -0800 | |
|---|---|---|
| committer | 2016-01-07 16:02:49 -0800 | |
| commit | 25d3c7c49bafb22723138bfab2e315d2d0a926fb (patch) | |
| tree | ada58506d2688e22b81e468ad6fe59cacd28fced | |
| parent | 5e677425e039de72578060ae5bd5ef9181c5678f (diff) | |
Revert "Short-term fix for unregistered JNI method"
This reverts commit 7922be86e29002dc3714824b2b669a9760de0528.
| -rw-r--r-- | core/jni/android_media_AudioTrack.cpp | 5 | ||||
| -rw-r--r-- | media/java/android/media/AudioTrack.java | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index 3746972bee15..768c7d450190 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -1049,12 +1049,9 @@ 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 // ---------------------------------------------------------------------------- @@ -1113,7 +1110,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}, - // FIXME {"native_get_FCC_8", "()I", (void *)android_media_AudioTrack_get_FCC_8}, + {"native_get_FCC_8", "()I", (void *)android_media_AudioTrack_get_FCC_8}, }; diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java index 6dd1072532f8..a810ff1bc2ba 100644 --- a/media/java/android/media/AudioTrack.java +++ b/media/java/android/media/AudioTrack.java @@ -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 = 8; // FIXME was native_get_FCC_8(), unregistered! + public static final int CHANNEL_COUNT_MAX = native_get_FCC_8(); /** 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(); - // FIXME static private native int native_get_FCC_8(); + static private native int native_get_FCC_8(); //--------------------------------------------------------- // Utility methods |