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

Commit 52ba48a8 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am f08b83be: am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer" 

* commit 'f08b83be':
  Remove unused field from MediaMuxer
parents d1cec98e f08b83be

media/java/android/media/MediaMuxer.java

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


final public class MediaMuxer {



    private long mNativeContext;



    static {

        System.loadLibrary("media_jni");

    }

media/jni/android_media_MediaMuxer.cpp

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



struct fields_t {

    jfieldID context;

    jmethodID arrayID;

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

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

    CHECK(byteBufClass != NULL);