From 584deb807e8d99d1ebe526edc993a7610ef8b05f Mon Sep 17 00:00:00 2001 From: volzhs Date: Sat, 25 Jun 2016 02:05:46 +0900 Subject: [PATCH] Fix string array parameter check with jni (cherry picked from commit 456b7733fca2af68c1943597e181d7bcd81edc78) --- platform/android/godot_android.cpp | 4 ++-- platform/android/java_glue.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/android/godot_android.cpp b/platform/android/godot_android.cpp index f9feb3481f4..640da2cb1bf 100644 --- a/platform/android/godot_android.cpp +++ b/platform/android/godot_android.cpp @@ -889,7 +889,7 @@ static Variant::Type get_jni_type(const String& p_type) { {"java.lang.String",Variant::STRING}, {"[I",Variant::INT_ARRAY}, {"[F",Variant::REAL_ARRAY}, - {"[java.lang.String",Variant::STRING_ARRAY}, + {"[Ljava.lang.String;",Variant::STRING_ARRAY}, {NULL,Variant::NIL} }; @@ -920,7 +920,7 @@ static const char* get_jni_sig(const String& p_type) { {"java.lang.String","Ljava/lang/String;"}, {"[I","[I"}, {"[F","[F"}, - {"[java.lang.String","[Ljava/lang/String;"}, + {"[Ljava.lang.String;","[Ljava/lang/String;"}, {NULL,"V"} }; diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index b5beb8fa2c0..371cc77e54a 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -1552,7 +1552,7 @@ static Variant::Type get_jni_type(const String& p_type) { {"[I",Variant::INT_ARRAY}, {"[B",Variant::RAW_ARRAY}, {"[F",Variant::REAL_ARRAY}, - {"[java.lang.String",Variant::STRING_ARRAY}, + {"[Ljava.lang.String;",Variant::STRING_ARRAY}, {"org.godotengine.godot.Dictionary", Variant::DICTIONARY}, {NULL,Variant::NIL} }; @@ -1588,7 +1588,7 @@ static const char* get_jni_sig(const String& p_type) { {"[I","[I"}, {"[B","[B"}, {"[F","[F"}, - {"[java.lang.String","[Ljava/lang/String;"}, + {"[Ljava.lang.String;","[Ljava/lang/String;"}, {NULL,"V"} };