From 3ce2fab0a6bb9388522fa65d31b179c4d5a3f3f5 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 18 Jun 2020 13:56:07 +0200 Subject: 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 Pick-to: 5.15 5.12 Reviewed-by: Assam Boudjelthia --- .../src/org/qtproject/qt5/android/bindings/QtServiceLoader.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/android/java/src') 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); } -- cgit v1.2.3