commit bf245cafbc30434ad45d2288b190ff1fa5734c5d
author The Android Automerger <android-build@google.com> Tue Apr 05 00:03:27 2016 -0700
committer The Android Automerger <android-build@google.com> Tue Apr 05 00:03:27 2016 -0700
tree 974edef5886c94e0404dd2638a994caffc03aa48
parent b935a00d99620789c9c1d4652e55621a215e8313
parent 806175f1ee90a0dd6f95a4a38ea95c7cdece5362

merge in nyc-release history after reset to nyc-dev

JniConstants.cpp

diff --git a/JniConstants.cpp b/JniConstants.cpp
index 9bad03c..e95f980 100644
--- a/JniConstants.cpp
+++ b/JniConstants.cpp
@@ -67,6 +67,7 @@
 jclass JniConstants::shortClass;
 jclass JniConstants::socketClass;
 jclass JniConstants::socketImplClass;
+jclass JniConstants::socketTaggerClass;
 jclass JniConstants::stringClass;
 jclass JniConstants::structAddrinfoClass;
 jclass JniConstants::structFlockClass;
@@ -145,6 +146,7 @@
     referenceClass = findClass(env, "java/lang/ref/Reference");
     shortClass = findClass(env, "java/lang/Short");
     socketClass = findClass(env, "java/net/Socket");
+    socketTaggerClass = findClass(env, "dalvik/system/SocketTagger");
     socketImplClass = findClass(env, "java/net/SocketImpl");
     stringClass = findClass(env, "java/lang/String");
     structAddrinfoClass = findClass(env, "android/system/StructAddrinfo");

include/nativehelper/JniConstants.h

diff --git a/include/nativehelper/JniConstants.h b/include/nativehelper/JniConstants.h
index c16b7b7..ba8f8cb 100644
--- a/include/nativehelper/JniConstants.h
+++ b/include/nativehelper/JniConstants.h
@@ -78,6 +78,7 @@
     static jclass shortClass;
     static jclass socketClass;
     static jclass socketImplClass;
+    static jclass socketTaggerClass;
     static jclass stringClass;
     static jclass structAddrinfoClass;
     static jclass structFlockClass;