Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 844b0475 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Remove dead code in AudioTrack JNI 

Change-Id: I17103485cdefdf2d1dbda8d1993e64c80d4e952e
parent 474daa2b

core/jni/android_media_AudioTrack.cpp

+0 −20
Original line number Original line Diff line number Diff line
@@ -884,21 +884,9 @@ static JNINativeMethod gMethods[] = { 




// field names found in android/media/AudioTrack.java

// field names found in android/media/AudioTrack.java

#define JAVA_POSTEVENT_CALLBACK_NAME                    "postEventFromNative"

#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_NATIVETRACKINJAVAOBJ_FIELD_NAME            "mNativeTrackInJavaObj"

#define JAVA_JNIDATA_FIELD_NAME                         "mJniData"

#define JAVA_JNIDATA_FIELD_NAME                         "mJniData"





#define JAVA_AUDIOFORMAT_CLASS_NAME             "android/media/AudioFormat"

#define JAVA_AUDIOMANAGER_CLASS_NAME            "android/media/AudioManager"



// ----------------------------------------------------------------------------

// ----------------------------------------------------------------------------

// preconditions:

// preconditions:

//    theClass is valid

//    theClass is valid
@@ -956,14 +944,6 @@ int register_android_media_AudioTrack(JNIEnv *env) 
        return -1;

        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));

    return AndroidRuntime::registerNativeMethods(env, kClassPathName, gMethods, NELEM(gMethods));

}

}