AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Pass a null Bundle when calling QtActivityDelegate.onCreate

Browse Source 
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 <assam.boudjelthia@qt.io>
This commit is contained in:
Andy Shaw 2020-06-18 13:56:07 +02:00
parent 4041610cb2
commit 3ce2fab0a6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/android/java/src/org/qtproject/qt5/android/bindings/QtServiceLoader.java
View File

@ -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);
}