Replace InetUnixAddress with UnixSocketAddress
UnixSocketAddress maps to stuct sockaddr_un from sys/un.h.
Bug: 3106438
Change-Id: Ia4d57729e286c8b3a62a78202bc2385f0d33cb52
diff --git a/JniConstants.cpp b/JniConstants.cpp
index a07466d..2511cb5 100644
--- a/JniConstants.cpp
+++ b/JniConstants.cpp
@@ -42,7 +42,6 @@
jclass JniConstants::inet6AddressClass;
jclass JniConstants::inetAddressClass;
jclass JniConstants::inetSocketAddressClass;
-jclass JniConstants::inetUnixAddressClass;
jclass JniConstants::inflaterClass;
jclass JniConstants::inputStreamClass;
jclass JniConstants::integerClass;
@@ -76,6 +75,7 @@
jclass JniConstants::structTimevalClass;
jclass JniConstants::structUcredClass;
jclass JniConstants::structUtsnameClass;
+jclass JniConstants::unixSocketAddressClass;
jclass JniConstants::zipEntryClass;
static jclass findClass(JNIEnv* env, const char* name) {
@@ -109,7 +109,6 @@
inet6AddressClass = findClass(env, "java/net/Inet6Address");
inetAddressClass = findClass(env, "java/net/InetAddress");
inetSocketAddressClass = findClass(env, "java/net/InetSocketAddress");
- inetUnixAddressClass = findClass(env, "java/net/InetUnixAddress");
inflaterClass = findClass(env, "java/util/zip/Inflater");
inputStreamClass = findClass(env, "java/io/InputStream");
integerClass = findClass(env, "java/lang/Integer");
@@ -143,5 +142,6 @@
structTimevalClass = findClass(env, "android/system/StructTimeval");
structUcredClass = findClass(env, "android/system/StructUcred");
structUtsnameClass = findClass(env, "android/system/StructUtsname");
+ unixSocketAddressClass = findClass(env, "android/system/UnixSocketAddress");
zipEntryClass = findClass(env, "java/util/zip/ZipEntry");
}
diff --git a/include/nativehelper/JniConstants.h b/include/nativehelper/JniConstants.h
index 2017e57..252f556 100644
--- a/include/nativehelper/JniConstants.h
+++ b/include/nativehelper/JniConstants.h
@@ -59,7 +59,6 @@
static jclass inet6AddressClass;
static jclass inetAddressClass;
static jclass inetSocketAddressClass;
- static jclass inetUnixAddressClass;
static jclass inflaterClass;
static jclass inputStreamClass;
static jclass integerClass;
@@ -93,6 +92,7 @@
static jclass structTimevalClass;
static jclass structUcredClass;
static jclass structUtsnameClass;
+ static jclass unixSocketAddressClass;
static jclass zipEntryClass;
};