commit e87e29bea4ae9b445bc726306e3fc4cd19e245eb
author Yi Kong <yikong@google.com> Mon Apr 04 14:07:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 04 14:07:29 2016 +0000
tree 672cafd9629acaa5b22474dceb2832b508c6cd50
parent 189cdb6be2e51201ae2149c3936d46ee0bc4cef4
parent b6fe27011acca7b4703da2534f4ce502b1fe6a5d

Merge "Add SocketTagger class to JniConstants"
am: b6fe270

* commit 'b6fe27011acca7b4703da2534f4ce502b1fe6a5d':
  Add SocketTagger class to JniConstants

Change-Id: I084745c4ef2c18d7fb49a8a06f1f702f44862f05

JniConstants.cpp

diff --git a/JniConstants.cpp b/JniConstants.cpp
index b2b4457..7bdd624 100644
--- a/JniConstants.cpp
+++ b/JniConstants.cpp
@@ -61,6 +61,7 @@
 jclass JniConstants::shortClass;
 jclass JniConstants::socketClass;
 jclass JniConstants::socketImplClass;
+jclass JniConstants::socketTaggerClass;
 jclass JniConstants::stringClass;
 jclass JniConstants::structAddrinfoClass;
 jclass JniConstants::structFlockClass;
@@ -126,6 +127,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;