Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unneeded JNI method"

Browse Source
This commit is contained in:
Treehugger Robot
2018-07-17 17:00:30 +00:00
committed by Gerrit Code Review
parent 0083876870 107e6f2f53
commit 1febe4196e
3 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/Parcel.java
View File

@@ -2149,8 +2149,6 @@ public final class Parcel {
@Deprecated @Deprecated
static native void closeFileDescriptor(FileDescriptor desc) throws IOException; 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(). * Read a byte value from the parcel at the current dataPosition().
*/ */

2
core/java/android/os/ParcelFileDescriptor.java
View File

@@ -683,7 +683,7 @@ public class ParcelFileDescriptor implements Parcelable, Closeable {
throw new IllegalStateException("Already closed"); throw new IllegalStateException("Already closed");
} }
final int fd = getFd(); final int fd = getFd();
Parcel.clearFileDescriptor(mFd); mFd.setInt$(-1);
writeCommStatusAndClose(Status.DETACHED, null); writeCommStatusAndClose(Status.DETACHED, null);
mClosed = true; mClosed = true;
mGuard.close(); mGuard.close();

13
core/jni/android_os_Parcel.cpp
View File

@@ -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) static jlong android_os_Parcel_create(JNIEnv* env, jclass clazz)
{ {
Parcel* parcel = new Parcel(); 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}, {"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}, {"dupFileDescriptor", "(Ljava/io/FileDescriptor;)Ljava/io/FileDescriptor;", (void*)android_os_Parcel_dupFileDescriptor},
{"closeFileDescriptor", "(Ljava/io/FileDescriptor;)V", (void*)android_os_Parcel_closeFileDescriptor}, {"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}, {"nativeCreate", "()J", (void*)android_os_Parcel_create},
{"nativeFreeBuffer", "(J)J", (void*)android_os_Parcel_freeBuffer}, {"nativeFreeBuffer", "(J)J", (void*)android_os_Parcel_freeBuffer},