diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-26 09:45:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-26 09:45:36 +0200 |
| commit | fad6b29a59525cddb3c0d9e284671d86e18a4667 (patch) | |
| tree | bcb7fed5d2e13c223b68920925de4b5614052323 | |
| parent | b02d67be308a9f756a9447afe14ed276a18813d2 (diff) | |
| parent | 456b7733fca2af68c1943597e181d7bcd81edc78 (diff) | |
Merge pull request #5390 from volzhs/jni-stringarray
Fix string array parameter check with jni
| -rw-r--r-- | platform/android/godot_android.cpp | 4 | ||||
| -rw-r--r-- | 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 edb051575f..9f909d7041 100644 --- a/platform/android/godot_android.cpp +++ b/platform/android/godot_android.cpp @@ -910,7 +910,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} }; @@ -941,7 +941,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 1ea7cd7ebb..5fd2ab8910 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -1563,7 +1563,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} }; @@ -1599,7 +1599,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"} }; |