summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Orion Hodson <oth@google.com> 2020-06-11 16:37:31 +0100
committer Orion Hodson <oth@google.com> 2020-06-24 14:13:13 +0100
commit4b258921e0a6b0a0d3ee76c052812eb2c16fd295 (patch)
treeac7a8d4b1a3d1decf6a4221467b268f4e861cc0a
parent77d486426222b905e104f8203ec3a2faa348fe62 (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)
-rw-r--r--packages/Tethering/jni/android_net_util_TetheringUtils.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/Tethering/jni/android_net_util_TetheringUtils.cpp b/packages/Tethering/jni/android_net_util_TetheringUtils.cpp
index 549344064405..f6eb40a842d5 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>