godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix string array parameter check with jni 

(cherry picked from commit 456b7733fc)
This commit is contained in:
volzhs 2016-06-25 02:05:46 +09:00 committed by Rémi Verschelde
parent 6116174d49
commit 584deb807e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/godot_android.cpp
View File

@ -889,7 +889,7 @@ static Variant::Type get_jni_type(const String& p_type) {
{"java.lang.String",Variant::STRING}, {"java.lang.String",Variant::STRING},
{"[I",Variant::INT_ARRAY}, {"[I",Variant::INT_ARRAY},
{"[F",Variant::REAL_ARRAY}, {"[F",Variant::REAL_ARRAY},
{"[java.lang.String",Variant::STRING_ARRAY}, {"[Ljava.lang.String;",Variant::STRING_ARRAY},
{NULL,Variant::NIL} {NULL,Variant::NIL}
}; };
@ -920,7 +920,7 @@ static const char* get_jni_sig(const String& p_type) {
{"java.lang.String","Ljava/lang/String;"}, {"java.lang.String","Ljava/lang/String;"},
{"[I","[I"}, {"[I","[I"},
{"[F","[F"}, {"[F","[F"},
{"[java.lang.String","[Ljava/lang/String;"}, {"[Ljava.lang.String;","[Ljava/lang/String;"},
{NULL,"V"} {NULL,"V"}
}; };

4
platform/android/java_glue.cpp
View File

@ -1552,7 +1552,7 @@ static Variant::Type get_jni_type(const String& p_type) {
{"[I",Variant::INT_ARRAY}, {"[I",Variant::INT_ARRAY},
{"[B",Variant::RAW_ARRAY}, {"[B",Variant::RAW_ARRAY},
{"[F",Variant::REAL_ARRAY}, {"[F",Variant::REAL_ARRAY},
{"[java.lang.String",Variant::STRING_ARRAY}, {"[Ljava.lang.String;",Variant::STRING_ARRAY},
{"org.godotengine.godot.Dictionary", Variant::DICTIONARY}, {"org.godotengine.godot.Dictionary", Variant::DICTIONARY},
{NULL,Variant::NIL} {NULL,Variant::NIL}
}; };
@ -1588,7 +1588,7 @@ static const char* get_jni_sig(const String& p_type) {
{"[I","[I"}, {"[I","[I"},
{"[B","[B"}, {"[B","[B"},
{"[F","[F"}, {"[F","[F"},
{"[java.lang.String","[Ljava/lang/String;"}, {"[Ljava.lang.String;","[Ljava/lang/String;"},
{NULL,"V"} {NULL,"V"}
}; };