diff options
author | Dianne Hackborn <hackbod@google.com> | 2011-05-20 10:37:34 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2011-05-20 12:48:22 -0700 |
commit | ea2117bdc03316a9292e2344c6fd157c85c13167 (patch) | |
tree | f1bc6b8428311c333b94d08e58c17ede1b2e54d5 /core/jni/android_os_ParcelFileDescriptor.cpp | |
parent | 69cb87576ba163b61bb0e6477a3b7c57a9b11d40 (diff) | |
download | frameworks_base-ea2117bdc03316a9292e2344c6fd157c85c13167.zip frameworks_base-ea2117bdc03316a9292e2344c6fd157c85c13167.tar.gz frameworks_base-ea2117bdc03316a9292e2344c6fd157c85c13167.tar.bz2 |
Add ParcelFileDescriptor.fromFd() and .adoptFd().
Change-Id: I2fe0429188dc80abaa0c8977f2e43a010e0f4da2
Diffstat (limited to 'core/jni/android_os_ParcelFileDescriptor.cpp')
-rw-r--r-- | core/jni/android_os_ParcelFileDescriptor.cpp | 42 |
1 files changed, 37 insertions, 5 deletions
diff --git a/core/jni/android_os_ParcelFileDescriptor.cpp b/core/jni/android_os_ParcelFileDescriptor.cpp index 1f737f9..e73d30b 100644 --- a/core/jni/android_os_ParcelFileDescriptor.cpp +++ b/core/jni/android_os_ParcelFileDescriptor.cpp @@ -52,6 +52,33 @@ static struct parcel_file_descriptor_offsets_t jfieldID mFileDescriptor; } gParcelFileDescriptorOffsets; +static jobject android_os_ParcelFileDescriptor_getFileDescriptorFromFd(JNIEnv* env, + jobject clazz, jint origfd) +{ + int fd = dup(origfd); + if (fd < 0) { + jniThrowException(env, "java/io/IOException", strerror(errno)); + return NULL; + } + jobject fileDescriptorClone = env->NewObject(gFileDescriptorOffsets.mClass, + gFileDescriptorOffsets.mConstructor); + if (fileDescriptorClone != NULL) { + env->SetIntField(fileDescriptorClone, gFileDescriptorOffsets.mDescriptor, fd); + } + return fileDescriptorClone; +} + +static jobject android_os_ParcelFileDescriptor_getFileDescriptorFromFdNoDup(JNIEnv* env, + jobject clazz, jint fd) +{ + jobject fileDescriptorClone = env->NewObject(gFileDescriptorOffsets.mClass, + gFileDescriptorOffsets.mConstructor); + if (fileDescriptorClone != NULL) { + env->SetIntField(fileDescriptorClone, gFileDescriptorOffsets.mDescriptor, fd); + } + return fileDescriptorClone; +} + static jobject android_os_ParcelFileDescriptor_getFileDescriptorFromSocket(JNIEnv* env, jobject clazz, jobject object) { @@ -61,17 +88,20 @@ static jobject android_os_ParcelFileDescriptor_getFileDescriptorFromSocket(JNIEn jobject fileDescriptorClone = env->NewObject(gFileDescriptorOffsets.mClass, gFileDescriptorOffsets.mConstructor); if (fileDescriptorClone != NULL) { + // XXXX need to throw an exception if the dup fails! env->SetIntField(fileDescriptorClone, gFileDescriptorOffsets.mDescriptor, dup(fd)); } return fileDescriptorClone; } -static int android_os_ParcelFileDescriptor_createPipeNative(JNIEnv* env, +static void android_os_ParcelFileDescriptor_createPipeNative(JNIEnv* env, jobject clazz, jobjectArray outFds) { int fds[2]; if (pipe(fds) < 0) { - return -errno; + int therr = errno; + jniThrowException(env, "java/io/IOException", strerror(therr)); + return; } for (int i=0; i<2; i++) { @@ -82,8 +112,6 @@ static int android_os_ParcelFileDescriptor_createPipeNative(JNIEnv* env, } env->SetObjectArrayElement(outFds, i, fdObj); } - - return 0; } static jint getFd(JNIEnv* env, jobject clazz) @@ -138,9 +166,13 @@ static jlong android_os_ParcelFileDescriptor_getFdNative(JNIEnv* env, jobject cl } static const JNINativeMethod gParcelFileDescriptorMethods[] = { + {"getFileDescriptorFromFd", "(I)Ljava/io/FileDescriptor;", + (void*)android_os_ParcelFileDescriptor_getFileDescriptorFromFd}, + {"getFileDescriptorFromFdNoDup", "(I)Ljava/io/FileDescriptor;", + (void*)android_os_ParcelFileDescriptor_getFileDescriptorFromFdNoDup}, {"getFileDescriptorFromSocket", "(Ljava/net/Socket;)Ljava/io/FileDescriptor;", (void*)android_os_ParcelFileDescriptor_getFileDescriptorFromSocket}, - {"createPipeNative", "([Ljava/io/FileDescriptor;)I", + {"createPipeNative", "([Ljava/io/FileDescriptor;)V", (void*)android_os_ParcelFileDescriptor_createPipeNative}, {"getStatSize", "()J", (void*)android_os_ParcelFileDescriptor_getStatSize}, |