From 478ed8b71f289438ed664bf2676b270325c93bfc Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Mon, 10 May 2021 16:16:37 +0300
Subject: Android: Add runOnMainAndroidThread() under QNativeInterface

This replaces QtAndroidPrivate::runOnAndroidThread{Sync} calls.
This also now allows passing std::function<> that can return values,
and not only an std::function<void()>.

This adds some tests for this calls as well.

Fixes: QTBUG-90501
Change-Id: I138d2aae64be17347f7ff712d8a86edb49ea8350
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/corelib/kernel/qjnihelpers.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/corelib/kernel/qjnihelpers.cpp')

diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp
index edb07b47cf4..46143d4c2c3 100644
--- a/src/corelib/kernel/qjnihelpers.cpp
+++ b/src/corelib/kernel/qjnihelpers.cpp
@@ -358,6 +358,9 @@ jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env)
     if (!registerPermissionNatives())
         return JNI_ERR;
 
+    if (!registerNativeInterfaceNatives())
+        return JNI_ERR;
+
     g_runPendingCppRunnablesMethodID = env->GetStaticMethodID(jQtNative,
                                                        "runPendingCppRunnablesOnAndroidThread",
                                                        "()V");
-- 
cgit v1.2.3