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

Commit 1febe419 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove unneeded JNI method"

parents 00838768 107e6f2f

core/java/android/os/Parcel.java

+0 −2
Original line number Diff line number Diff line
@@ -2149,8 +2149,6 @@ public final class Parcel { 
    @Deprecated

    static native void closeFileDescriptor(FileDescriptor desc) throws IOException;



    static native void clearFileDescriptor(FileDescriptor desc);



    /**

     * Read a byte value from the parcel at the current dataPosition().

     */

core/java/android/os/ParcelFileDescriptor.java

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { 
                throw new IllegalStateException("Already closed");

            }

            final int fd = getFd();

            Parcel.clearFileDescriptor(mFd);

            mFd.setInt$(-1);

            writeCommStatusAndClose(Status.DETACHED, null);

            mClosed = true;

            mGuard.close();

core/jni/android_os_Parcel.cpp

+0 −13
Original line number Diff line number Diff line
@@ -554,18 +554,6 @@ static void android_os_Parcel_closeFileDescriptor(JNIEnv* env, jclass clazz, job 
    }

}



static void android_os_Parcel_clearFileDescriptor(JNIEnv* env, jclass clazz, jobject object)

{

    if (object == NULL) {

        jniThrowNullPointerException(env, NULL);

        return;

    }

    int fd = jniGetFDFromFileDescriptor(env, object);

    if (fd >= 0) {

        jniSetFileDescriptorOfFD(env, object, -1);

    }

}



static jlong android_os_Parcel_create(JNIEnv* env, jclass clazz)

{

    Parcel* parcel = new Parcel();
@@ -811,7 +799,6 @@ static const JNINativeMethod gParcelMethods[] = { 
    {"openFileDescriptor",        "(Ljava/lang/String;I)Ljava/io/FileDescriptor;", (void*)android_os_Parcel_openFileDescriptor},

    {"dupFileDescriptor",         "(Ljava/io/FileDescriptor;)Ljava/io/FileDescriptor;", (void*)android_os_Parcel_dupFileDescriptor},

    {"closeFileDescriptor",       "(Ljava/io/FileDescriptor;)V", (void*)android_os_Parcel_closeFileDescriptor},

    {"clearFileDescriptor",       "(Ljava/io/FileDescriptor;)V", (void*)android_os_Parcel_clearFileDescriptor},



    {"nativeCreate",              "()J", (void*)android_os_Parcel_create},

    {"nativeFreeBuffer",          "(J)J", (void*)android_os_Parcel_freeBuffer},