| commit | 4b258921e0a6b0a0d3ee76c052812eb2c16fd295 | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Thu Jun 11 16:37:31 2020 +0100 |
| committer | Orion Hodson <oth@google.com> | Wed Jun 24 14:13:13 2020 +0100 |
| tree | ac7a8d4b1a3d1decf6a4221467b268f4e861cc0a | |
| parent | 77d486426222b905e104f8203ec3a2faa348fe62 [diff] |
Sync with libnativehelper refactoring jniGetFDFromFileDescriptor() is now a legacy method and moved to a separate header. Bug: 151443957 Bug: 158749603 Test: m Change-Id: Icd06e9a315680c2251dbb9032a904dd6d66aa359 Merged-In: Icd06e9a315680c2251dbb9032a904dd6d66aa359 Exempt-From-Owner-Approval: cherry pick (cherry picked from commit 3ada11361a2c4497af29af5688f5cc1298c3d9ee)
diff --git a/packages/Tethering/jni/android_net_util_TetheringUtils.cpp b/packages/Tethering/jni/android_net_util_TetheringUtils.cpp index 54934406..f6eb40a 100644 --- a/packages/Tethering/jni/android_net_util_TetheringUtils.cpp +++ b/packages/Tethering/jni/android_net_util_TetheringUtils.cpp
@@ -18,6 +18,7 @@ #include <error.h> #include <jni.h> #include <nativehelper/JNIHelp.h> +#include <nativehelper/JNIHelpCompat.h> #include <nativehelper/ScopedUtfChars.h> #include <net/if.h> #include <netinet/icmp6.h>