diff options
| author | Orion Hodson <oth@google.com> | 2021-04-30 17:26:21 +0100 |
|---|---|---|
| committer | Orion Hodson <oth@google.com> | 2021-05-04 09:05:59 +0100 |
| commit | b32c074a30209122c50139fc319dc536470a32ae (patch) | |
| tree | 7271f6a1859c53c11692e614da88ffb82250385e /module_ndk_libs | |
| parent | 200df5e5f32a0c6f10e999c53cb372e893b3b71d (diff) | |
| download | extras-b32c074a30209122c50139fc319dc536470a32ae.tar.gz | |
Update file_descriptor_jni.h and related symbols
Bug: 185256332
Test: mma
Change-Id: I02e73ee8fe5ff94b63b8937845a3a41e93d21333
Diffstat (limited to 'module_ndk_libs')
| -rw-r--r-- | module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h | 6 | ||||
| -rw-r--r-- | module_ndk_libs/libnativehelper/libnativehelper.map.txt | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h b/module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h index 793f7bcf..4d4afa1a 100644 --- a/module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h +++ b/module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h @@ -60,6 +60,9 @@ jobject AFileDescriptor_create(JNIEnv* env) __INTRODUCED_IN(31); * \param fileDescriptor a java.io.FileDescriptor instance. * \return the Unix file descriptor wrapped by \a fileDescriptor. */ +int AFileDescriptor_getFd(JNIEnv* env, jobject fileDescriptor) __INTRODUCED_IN(31); + +// Deprecated equivalent of AFileDescriptor_getFd (b/185256332). int AFileDescriptor_getFD(JNIEnv* env, jobject fileDescriptor) __INTRODUCED_IN(31); /** @@ -77,6 +80,9 @@ int AFileDescriptor_getFD(JNIEnv* env, jobject fileDescriptor) __INTRODUCED_IN(3 * \param fileDescriptor a java.io.FileDescriptor instance. * \param fd a Unix file descriptor that \a fileDescriptor will subsequently represent. */ +void AFileDescriptor_setFd(JNIEnv* env, jobject fileDescriptor, int fd) __INTRODUCED_IN(31); + +// Deprecated equivalent of AFileDescriptor_setFd (b/185256332). void AFileDescriptor_setFD(JNIEnv* env, jobject fileDescriptor, int fd) __INTRODUCED_IN(31); __END_DECLS diff --git a/module_ndk_libs/libnativehelper/libnativehelper.map.txt b/module_ndk_libs/libnativehelper/libnativehelper.map.txt index 0f5c3fa0..70e0ece1 100644 --- a/module_ndk_libs/libnativehelper/libnativehelper.map.txt +++ b/module_ndk_libs/libnativehelper/libnativehelper.map.txt @@ -2,7 +2,11 @@ LIBNATIVEHELPER_S { # introduced=S global: # NDK API for libnativehelper. AFileDescriptor_create; + AFileDescriptor_getFd; + AFileDescriptor_setFd; + # AFileDescriptor_getFD is deprecated pending removal (b/185256332). AFileDescriptor_getFD; + # AFileDescriptor_setFD is deprecated pending removal (b/185256332). AFileDescriptor_setFD; # JNI Invocation methods available to platform and apps. |