Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

[Android] Fix Android JNI Crash #2827

Merged
merged 9 commits into from
Aug 15, 2019
Merged

[Android] Fix Android JNI Crash #2827

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ac42ac7
[Android] Fix Android JNI Crash
YorkShen Aug 14, 2019
a11db34
Fix crash in EagleBridge::WeexCoreHandler::PostTaskToMsgLoop
YorkShen Aug 14, 2019
174029f
Avoid multiple initialization.
YorkShen Aug 14, 2019
266a5a4
Revert changes of InitSciptThread
YorkShen Aug 14, 2019
04bc406
Post successCallback in RequestHandler to JSThread.
YorkShen Aug 14, 2019
6122f55
Revert "Post successCallback in RequestHandler to JSThread."
YorkShen Aug 14, 2019
afa428e
Delete `;`
YorkShen Aug 14, 2019
4bf1e4e
Merge branch 'master' into bugfix/android_jni_crash
YorkShen Aug 14, 2019
52ff668
Merge branch 'master' into bugfix/android_jni_crash
YorkShen Aug 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions weex_core/Source/android/wrap/wx_bridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
#include "base/android/jni_type.h"
#include "base/android/jni/jbytearray_ref.h"
#include "base/android/jniprebuild/jniheader/WXBridge_jni.h"
#include "base/log_defines.h"
#include "core/config/core_environment.h"
#include "core/layout/layout.h"
#include "core/layout/measure_func_adapter_impl_android.h"
Expand Down Expand Up @@ -305,7 +304,9 @@ static void SetDeviceDisplay(JNIEnv* env, jobject jcaller, jstring instanceId,

static jint InitFramework(JNIEnv* env, jobject object, jstring script,
jobject params) {
WXBridge::Instance()->Reset(env, object);
if (!WXBridge::Instance()->jni_object()) {
WXBridge::Instance()->Reset(env, object);
}
// Init platform thread --- ScriptThread
WeexCoreManager::Instance()->InitScriptThread();
// Exception handler for so
Expand Down Expand Up @@ -620,6 +621,9 @@ static jint CreateInstanceContext(JNIEnv* env, jobject jcaller,

// If strategy is DATA_RENDER_BINARY, jscript is a jbyteArray, otherwise jstring
// TODO use better way
if (!WXBridge::Instance()->jni_object()) {
WXBridge::Instance()->Reset(env, jcaller);
}
if (scoped_render_strategy.getChars() != nullptr
&& strcmp(scoped_render_strategy.getChars(), "DATA_RENDER_BINARY") == 0) {
JByteArrayRef byte_array(env, static_cast<jbyteArray>(jscript.Get()));
Expand Down