summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-08-01 07:26:22 -0700
committerGlenn Kasten <gkasten@google.com>2013-08-02 12:17:29 -0700
commit844b0475ed26a1967919a3f119448c7c3159cb25 (patch)
tree5a65a283d9d6847922430104f554939fbae50b1a
parent474daa2b7838402a1ef81140a512613e1b37a54e (diff)
downloadframeworks_base-844b0475ed26a1967919a3f119448c7c3159cb25.zip
frameworks_base-844b0475ed26a1967919a3f119448c7c3159cb25.tar.gz
frameworks_base-844b0475ed26a1967919a3f119448c7c3159cb25.tar.bz2
Remove dead code in AudioTrack JNI
Change-Id: I17103485cdefdf2d1dbda8d1993e64c80d4e952e
-rw-r--r--core/jni/android_media_AudioTrack.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp
index a1b85bc..7a5aadb 100644
--- a/core/jni/android_media_AudioTrack.cpp
+++ b/core/jni/android_media_AudioTrack.cpp
@@ -884,21 +884,9 @@ static JNINativeMethod gMethods[] = {
// field names found in android/media/AudioTrack.java
#define JAVA_POSTEVENT_CALLBACK_NAME "postEventFromNative"
-#define JAVA_CONST_BUFFER_COUNT_NAME "BUFFER_COUNT"
-#define JAVA_CONST_STREAM_VOICE_CALL_NAME "STREAM_VOICE_CALL"
-#define JAVA_CONST_STREAM_SYSTEM_NAME "STREAM_SYSTEM"
-#define JAVA_CONST_STREAM_RING_NAME "STREAM_RING"
-#define JAVA_CONST_STREAM_MUSIC_NAME "STREAM_MUSIC"
-#define JAVA_CONST_STREAM_ALARM_NAME "STREAM_ALARM"
-#define JAVA_CONST_STREAM_NOTIFICATION_NAME "STREAM_NOTIFICATION"
-#define JAVA_CONST_STREAM_BLUETOOTH_SCO_NAME "STREAM_BLUETOOTH_SCO"
-#define JAVA_CONST_STREAM_DTMF_NAME "STREAM_DTMF"
#define JAVA_NATIVETRACKINJAVAOBJ_FIELD_NAME "mNativeTrackInJavaObj"
#define JAVA_JNIDATA_FIELD_NAME "mJniData"
-#define JAVA_AUDIOFORMAT_CLASS_NAME "android/media/AudioFormat"
-#define JAVA_AUDIOMANAGER_CLASS_NAME "android/media/AudioManager"
-
// ----------------------------------------------------------------------------
// preconditions:
// theClass is valid
@@ -956,14 +944,6 @@ int register_android_media_AudioTrack(JNIEnv *env)
return -1;
}
- // Get the format constants from the AudioFormat class
- jclass audioFormatClass = NULL;
- audioFormatClass = env->FindClass(JAVA_AUDIOFORMAT_CLASS_NAME);
- if (audioFormatClass == NULL) {
- ALOGE("Can't find %s", JAVA_AUDIOFORMAT_CLASS_NAME);
- return -1;
- }
-
return AndroidRuntime::registerNativeMethods(env, kClassPathName, gMethods, NELEM(gMethods));
}