diff options
| author | Orion Hodson <oth@google.com> | 2021-05-12 12:52:57 +0100 |
|---|---|---|
| committer | Orion Hodson <oth@google.com> | 2021-05-12 12:52:57 +0100 |
| commit | 826f3ad5b806dc8b28d59830235ba995641cacdd (patch) | |
| tree | 94f0856d96ad664d839624ab8c88572142163b54 /module_ndk_libs | |
| parent | e1e3b812931a3756223470a109af6c950e754b55 (diff) | |
| download | extras-826f3ad5b806dc8b28d59830235ba995641cacdd.tar.gz | |
Remove AFileDescriptor_{get,set}FD
These are replaced by AFileDescriptor_{get,set}Fd.
Bug: 185256332
Test: TH
Change-Id: I837cd1524b666213c1d24be249d164a3b73f1331
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, 0 insertions, 10 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 4d4afa1a..fbdfef51 100644 --- a/module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h +++ b/module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h @@ -62,9 +62,6 @@ jobject AFileDescriptor_create(JNIEnv* env) __INTRODUCED_IN(31); */ 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); - /** * Sets the Unix file descriptor represented by the given java.io.FileDescriptor. * @@ -82,9 +79,6 @@ int AFileDescriptor_getFD(JNIEnv* env, jobject fileDescriptor) __INTRODUCED_IN(3 */ 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 70e0ece1..72efd923 100644 --- a/module_ndk_libs/libnativehelper/libnativehelper.map.txt +++ b/module_ndk_libs/libnativehelper/libnativehelper.map.txt @@ -4,10 +4,6 @@ LIBNATIVEHELPER_S { # introduced=S 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. JNI_CreateJavaVM; |