[TIMOB-23901] Android: Fix KrollRuntime init on main thread (#8426)

* [TIMOB-23901] Fix KrollRuntime init on main thread * [TIMOB-23901] Fix IdleNotificationDeadline() duration in nativeIdle()
tidev · Sep 30, 2016 · f78f8cc · f78f8cc
1 parent adba30b
commit f78f8cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/android/runtime/common/src/java/org/appcelerator/kroll/KrollRuntime.java b/android/runtime/common/src/java/org/appcelerator/kroll/KrollRuntime.java
@@ -351,7 +351,12 @@ private static void syncInit()
 		synchronized (runtimeState) {
 			if (runtimeState == State.DISPOSED) {
 				instance.initLatch = new CountDownLatch(1);
-				instance.handler.sendEmptyMessage(MSG_INIT);
+
+				if (instance.isRuntimeThread()) {
+					instance.doInit();
+				} else {
+					instance.handler.sendEmptyMessage(MSG_INIT);
+				}
 
 			} else if (runtimeState == State.RELEASED) {
 				runtimeState = State.RELAUNCHED;

diff --git a/android/runtime/v8/src/native/V8Runtime.cpp b/android/runtime/v8/src/native/V8Runtime.cpp
@@ -318,8 +318,8 @@ JNIEXPORT jboolean JNICALL Java_org_appcelerator_kroll_runtime_v8_V8Runtime_nati
 	//}
 
 	// FIXME What is a good value to use here? We're basically giving it 100 ms to run right now
-	double deadline_in_ms = (V8Runtime::platform->MonotonicallyIncreasingTime() * static_cast<double>(1000)) + 100.0;
-	return V8Runtime::v8_isolate->IdleNotificationDeadline(deadline_in_ms);
+	double deadline_in_s = V8Runtime::platform->MonotonicallyIncreasingTime() + 0.1;
+	return V8Runtime::v8_isolate->IdleNotificationDeadline(deadline_in_s);
 }
 
 /*