summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2020-06-18 13:56:07 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-06-23 12:01:05 +0000
commit5c7b7f8764b25f845119944ec1abe47b1e7df76b (patch)
treec55cd97217415d1030300ca89093b7d01541f396 /src/android
parentde6e92e26a49de4942f006c2e70f11d1dbf600d6 (diff)
Android: Pass a null Bundle when calling QtActivityDelegate.onCreate
The onCreate function expects a Bundle variable to be passed in so it needs to get a null Bundle in this aspect to prevent it from crashing due to the lack of parameters. Change-Id: I8cc4b62d9e8db170b957f7574360033e91ca3493 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 3ce2fab0a6bb9388522fa65d31b179c4d5a3f3f5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/java/src/org/qtproject/qt5/android/bindings/QtServiceLoader.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtServiceLoader.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtServiceLoader.java
index 60aecbf7b3..e32a4048e1 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtServiceLoader.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtServiceLoader.java
@@ -36,6 +36,7 @@
package org.qtproject.qt5.android.bindings;
+import android.os.Bundle;
import android.content.ComponentName;
import android.content.pm.PackageManager;
@@ -55,8 +56,10 @@ public class QtServiceLoader extends QtLoader {
return;
}
- if (QtApplication.m_delegateObject != null && QtApplication.onCreate != null)
- QtApplication.invokeDelegateMethod(QtApplication.onCreate);
+ if (QtApplication.m_delegateObject != null && QtApplication.onCreate != null) {
+ Bundle bundle = null;
+ QtApplication.invokeDelegateMethod(QtApplication.onCreate, bundle);
+ }
startApp(true);
}