aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Kong <yikong@google.com>2016-08-04 13:13:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-08-04 13:13:53 +0000
commit244985d0983c94c33b6a34ce2e2c7b3c721b601f (patch)
tree076669541cfb9467c1a37f00450a4db4759de71a
parent8ee793f04c81d191996f8eca831c36ecc5eeae97 (diff)
parent5b948ff3b399dc04975d82b652b28af92d03107c (diff)
downloadplatform_libnativehelper-244985d0983c94c33b6a34ce2e2c7b3c721b601f.tar.gz
platform_libnativehelper-244985d0983c94c33b6a34ce2e2c7b3c721b601f.tar.bz2
platform_libnativehelper-244985d0983c94c33b6a34ce2e2c7b3c721b601f.zip
Merge "Add inet6AddressHolderClass JniConstant"
am: 5b948ff3b3 Change-Id: I4f53bdbaee968bf9f0530799975e048ba6a7c8fc
-rw-r--r--JniConstants.cpp2
-rw-r--r--include/nativehelper/JniConstants.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/JniConstants.cpp b/JniConstants.cpp
index 43ad419..87cb284 100644
--- a/JniConstants.cpp
+++ b/JniConstants.cpp
@@ -37,6 +37,7 @@ jclass JniConstants::errnoExceptionClass;
jclass JniConstants::fileDescriptorClass;
jclass JniConstants::gaiExceptionClass;
jclass JniConstants::inet6AddressClass;
+jclass JniConstants::inet6AddressHolderClass;
jclass JniConstants::inetAddressClass;
jclass JniConstants::inetAddressHolderClass;
jclass JniConstants::inetSocketAddressClass;
@@ -100,6 +101,7 @@ void JniConstants::init(JNIEnv* env) {
fileDescriptorClass = findClass(env, "java/io/FileDescriptor");
gaiExceptionClass = findClass(env, "android/system/GaiException");
inet6AddressClass = findClass(env, "java/net/Inet6Address");
+ inet6AddressHolderClass = findClass(env, "java/net/Inet6Address$Inet6AddressHolder");
inetAddressClass = findClass(env, "java/net/InetAddress");
inetAddressHolderClass = findClass(env, "java/net/InetAddress$InetAddressHolder");
inetSocketAddressClass = findClass(env, "java/net/InetSocketAddress");
diff --git a/include/nativehelper/JniConstants.h b/include/nativehelper/JniConstants.h
index af9e70a..82efa0d 100644
--- a/include/nativehelper/JniConstants.h
+++ b/include/nativehelper/JniConstants.h
@@ -48,6 +48,7 @@ struct JniConstants {
static jclass fileDescriptorClass;
static jclass gaiExceptionClass;
static jclass inet6AddressClass;
+ static jclass inet6AddressHolderClass;
static jclass inetAddressClass;
static jclass inetAddressHolderClass;
static jclass inetSocketAddressClass;