commit 5be4514308117d4bdd94c177544687d2d9be021f
author Elliott Hughes <enh@google.com> Fri Sep 06 22:19:03 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 06 22:19:03 2013 +0000
tree 5a533d380ea05be32f469f57dc95d6a70ecefece
parent be92cc6d1fa625bd203f363628efb3defa1d9ff2
parent 89ee8af81cfe231ed3cd21b050ec16fbcf419683

Merge "Support apps that pass JNI_VERSION_1_1 to GetEnv."

vm/Jni.cpp

diff --git a/vm/Jni.cpp b/vm/Jni.cpp
index 4ada075..0e77fab 100644
--- a/vm/Jni.cpp
+++ b/vm/Jni.cpp
@@ -2904,7 +2904,9 @@
 static jint GetEnv(JavaVM* vm, void** env, jint version) {
     Thread* self = dvmThreadSelf();
 
-    if (dvmIsBadJniVersion(version)) {
+    // GetEnv also accepts JNI_VERSION_1_1, but always returns a JNIEnv*
+    // corresponding to the most current supported JNI version.
+    if (dvmIsBadJniVersion(version) && version != JNI_VERSION_1_1) {
         ALOGE("Bad JNI version passed to GetEnv: %d", version);
         return JNI_EVERSION;
     }