commit f4a3c1e07ae10fabf174da0904d2d0c3c2550bdb
author Kenny Root <kroot@google.com> Thu Mar 07 11:20:28 2013 -0800
committer Brian Carlstrom <bdc@google.com> Thu May 09 16:42:25 2013 -0700
tree a7b2d3019df2231bb2eac9a9695430264c3cb410
parent 48f1451112cc1480957e52c680810cf40d148edf

Add Calendar, Object, Object[] to well-known list

Needed for libcore change 75dc9601af8ab3c65114e3c8c57d29ce5ac64125

(cherry picked from commit 5cfc839e8c72a271745245dcebaeccdbfc069153)

Change-Id: Ie2b4593d97c3815af38c12a35e12cb216aa91887

JniConstants.cpp

diff --git a/JniConstants.cpp b/JniConstants.cpp
index eb255bb..7ffcbb2 100644
--- a/JniConstants.cpp
+++ b/JniConstants.cpp
@@ -24,6 +24,7 @@
 jclass JniConstants::booleanClass;
 jclass JniConstants::byteArrayClass;
 jclass JniConstants::byteClass;
+jclass JniConstants::calendarClass;
 jclass JniConstants::characterClass;
 jclass JniConstants::charsetICUClass;
 jclass JniConstants::constructorClass;
@@ -46,6 +47,8 @@
 jclass JniConstants::methodClass;
 jclass JniConstants::mutableIntClass;
 jclass JniConstants::mutableLongClass;
+jclass JniConstants::objectClass;
+jclass JniConstants::objectArrayClass;
 jclass JniConstants::outputStreamClass;
 jclass JniConstants::parsePositionClass;
 jclass JniConstants::patternSyntaxExceptionClass;
@@ -81,6 +84,7 @@
     booleanClass = findClass(env, "java/lang/Boolean");
     byteClass = findClass(env, "java/lang/Byte");
     byteArrayClass = findClass(env, "[B");
+    calendarClass = findClass(env, "java/util/Calendar");
     characterClass = findClass(env, "java/lang/Character");
     charsetICUClass = findClass(env, "java/nio/charset/CharsetICU");
     constructorClass = findClass(env, "java/lang/reflect/Constructor");
@@ -103,6 +107,8 @@
     methodClass = findClass(env, "java/lang/reflect/Method");
     mutableIntClass = findClass(env, "libcore/util/MutableInt");
     mutableLongClass = findClass(env, "libcore/util/MutableLong");
+    objectClass = findClass(env, "java/lang/Object");
+    objectArrayClass = findClass(env, "[Ljava/lang/Object;");
     outputStreamClass = findClass(env, "java/io/OutputStream");
     parsePositionClass = findClass(env, "java/text/ParsePosition");
     patternSyntaxExceptionClass = findClass(env, "java/util/regex/PatternSyntaxException");

include/nativehelper/JniConstants.h

diff --git a/include/nativehelper/JniConstants.h b/include/nativehelper/JniConstants.h
index 2408435..117dec5 100644
--- a/include/nativehelper/JniConstants.h
+++ b/include/nativehelper/JniConstants.h
@@ -45,6 +45,7 @@
     static jclass booleanClass;
     static jclass byteArrayClass;
     static jclass byteClass;
+    static jclass calendarClass;
     static jclass characterClass;
     static jclass charsetICUClass;
     static jclass constructorClass;
@@ -67,6 +68,8 @@
     static jclass methodClass;
     static jclass mutableIntClass;
     static jclass mutableLongClass;
+    static jclass objectClass;
+    static jclass objectArrayClass;
     static jclass outputStreamClass;
     static jclass parsePositionClass;
     static jclass patternSyntaxExceptionClass;