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

Commit be8fbb8f authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "Remove unused field from MediaMuxer"

parents 3da645f3 535daa19

media/java/android/media/MediaMuxer.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -65,8 +65,6 @@ import java.util.Map; 




final public class MediaMuxer {

final public class MediaMuxer {





    private long mNativeContext;



    static {

    static {

        System.loadLibrary("media_jni");

        System.loadLibrary("media_jni");

    }

    }

media/jni/android_media_MediaMuxer.cpp

+0 −7
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ 
namespace android {

namespace android {





struct fields_t {

struct fields_t {

    jfieldID context;

    jmethodID arrayID;

    jmethodID arrayID;

};

};
@@ -252,12 +251,6 @@ int register_android_media_MediaMuxer(JNIEnv *env) { 
    int err = AndroidRuntime::registerNativeMethods(env,

    int err = AndroidRuntime::registerNativeMethods(env,

                "android/media/MediaMuxer", gMethods, NELEM(gMethods));

                "android/media/MediaMuxer", gMethods, NELEM(gMethods));





    jclass clazz = env->FindClass("android/media/MediaMuxer");

    CHECK(clazz != NULL);



    gFields.context = env->GetFieldID(clazz, "mNativeContext", "J");

    CHECK(gFields.context != NULL);



    jclass byteBufClass = env->FindClass("java/nio/ByteBuffer");

    jclass byteBufClass = env->FindClass("java/nio/ByteBuffer");

    CHECK(byteBufClass != NULL);

    CHECK(byteBufClass != NULL);