2 files changed, 39 insertions, 15 deletions
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
index c3074c353e..3a8fb34863 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
@@ -47,6 +47,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.view.Window;
 
+import org.qtproject.qt5.android.QtNative;
 
 import java.lang.reflect.Field;
 
@@ -140,8 +141,20 @@ public class QtActivityLoader extends QtLoader {
 
         m_activity.requestWindowFeature(Window.FEATURE_ACTION_BAR);
 
-        if (QtApplication.m_delegateObject != null && QtApplication.onCreate != null) {
-            QtApplication.invokeDelegateMethod(QtApplication.onCreate, savedInstanceState);
+        if (QtNative.isStarted()) {
+            boolean updated = QtNative.activityDelegate().updateActivity(m_activity);
+            if (!updated) {
+                //  could not update the activity so restart the application
+                Intent intent = Intent.makeRestartActivityTask(m_activity.getComponentName());
+                m_activity.startActivity(intent);
+                QtNative.quitApp();
+                Runtime.getRuntime().exit(0);
+            }
+
+            // there can only be a valid delegate object if the QtNative was started.
+            if (QtApplication.m_delegateObject != null && QtApplication.onCreate != null)
+                QtApplication.invokeDelegateMethod(QtApplication.onCreate, savedInstanceState);
+                
             return;
         }
 
@@ -150,20 +163,20 @@ public class QtActivityLoader extends QtLoader {
         ENVIRONMENT_VARIABLES += "\tQT_ANDROID_THEME=" + QT_ANDROID_DEFAULT_THEME
                 + "/\tQT_ANDROID_THEME_DISPLAY_DPI=" + m_displayDensity + "\t";
 
-        if (null == m_activity.getLastNonConfigurationInstance()) {
-            if (m_contextInfo.metaData.containsKey("android.app.background_running")
-                    && m_contextInfo.metaData.getBoolean("android.app.background_running")) {
-                ENVIRONMENT_VARIABLES += "QT_BLOCK_EVENT_LOOPS_WHEN_SUSPENDED=0\t";
-            } else {
-                ENVIRONMENT_VARIABLES += "QT_BLOCK_EVENT_LOOPS_WHEN_SUSPENDED=1\t";
-            }
 
-            if (m_contextInfo.metaData.containsKey("android.app.auto_screen_scale_factor")
-                    && m_contextInfo.metaData.getBoolean("android.app.auto_screen_scale_factor")) {
-                ENVIRONMENT_VARIABLES += "QT_AUTO_SCREEN_SCALE_FACTOR=1\t";
-            }
+        if (m_contextInfo.metaData.containsKey("android.app.background_running")
+                && m_contextInfo.metaData.getBoolean("android.app.background_running")) {
+            ENVIRONMENT_VARIABLES += "QT_BLOCK_EVENT_LOOPS_WHEN_SUSPENDED=0\t";
+        } else {
+            ENVIRONMENT_VARIABLES += "QT_BLOCK_EVENT_LOOPS_WHEN_SUSPENDED=1\t";
+        }
 
-            startApp(true);
+        if (m_contextInfo.metaData.containsKey("androi.app.auto_screen_scale_factor")
+                && m_contextInfo.metaData.getBoolean("android.app.auto_screen_scale_factor")) {
+            ENVIRONMENT_VARIABLES += "QT_AUTO_SCREEN_SCALE_FACTOR=1\t";
         }
+
+        startApp(true);
+
     }
 }
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java
index 67ced7524c..9fc8aaa181 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java
@@ -37,6 +37,7 @@
 package org.qtproject.qt5.android.bindings;
 
 import android.app.Service;
+import android.util.Log;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -54,7 +55,17 @@ public class QtService extends Service
     /////////////// PLEASE DO NOT CHANGE THE FOLLOWING CODE //////////////////////////
     //////////////////////////////////////////////////////////////////////////////////
     protected void onCreateHook() {
-        m_loader.onCreate();
+        // the application has already started
+        // do not reload everything again
+        if (QtNative.isStarted()) {
+            m_loader = null;
+            Log.w(QtNative.QtTAG,
+                "A QtService tried to start in the same process as an initiated " +
+                "QtActivity. That is not supported. This results in the service " +
+                "functioning as an Android Service detached from Qt.");
+        } else {
+            m_loader.onCreate();
+        }
     }
     @Override
     public void onCreate()