Android: Clean QtActivity and QtService from uneccessary overrides

Following the previous change in the chain, this removes override calls
that have no implementation under Qt Delegates, so they can be removed
and
the default behavior would persist.

Task-number: QTBUG-115014
Task-number: QTBUG-114593
Change-Id: Ia7c76e9b56c63cba935cb3d2ae3b6260d3462e51
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>

1 files changed, 2 insertions, 53 deletions

diff --git a/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java
index d900c33f0a..8322af2ae7 100644
--- a/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java
@@ -8,7 +8,6 @@ import android.app.Service;
 import android.util.Log;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.os.Bundle;
 import android.os.IBinder;
 
 import org.qtproject.qt.android.QtNative;
@@ -19,11 +18,11 @@ public class QtService extends Service
 {
     QtServiceLoader m_loader = new QtServiceLoader(this, QtService.class);
 
-
     /////////////////////////// forward all notifications ////////////////////////////
     /////////////////////////// Super class calls ////////////////////////////////////
     /////////////// PLEASE DO NOT CHANGE THE FOLLOWING CODE //////////////////////////
     //////////////////////////////////////////////////////////////////////////////////
+
     protected void onCreateHook() {
         // the application has already started
         // do not reload everything again
@@ -43,7 +42,6 @@ public class QtService extends Service
         super.onCreate();
         onCreateHook();
     }
-    //---------------------------------------------------------------------------
 
     @Override
     public void onDestroy()
@@ -51,7 +49,6 @@ public class QtService extends Service
         super.onDestroy();
         QtLoader.invokeDelegate();
     }
-    //---------------------------------------------------------------------------
 
     @Override
     public IBinder onBind(Intent intent)
@@ -62,7 +59,6 @@ public class QtService extends Service
         else
             return null;
     }
-    //---------------------------------------------------------------------------
 
     @Override
     public void onConfigurationChanged(Configuration newConfig)
@@ -74,54 +70,6 @@ public class QtService extends Service
     {
         super.onConfigurationChanged(newConfig);
     }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onLowMemory()
-    {
-        if (!QtLoader.invokeDelegate().invoked)
-            super.onLowMemory();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId)
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate(intent, flags, startId);
-        if (res.invoked)
-            return (Integer) res.methodReturns;
-        else
-            return super.onStartCommand(intent, flags, startId);
-    }
-    public int super_onStartCommand(Intent intent, int flags, int startId)
-    {
-        return super.onStartCommand(intent, flags, startId);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onTaskRemoved(Intent rootIntent)
-    {
-        if (!QtLoader.invokeDelegate(rootIntent).invoked)
-            super.onTaskRemoved(rootIntent);
-    }
-    public void super_onTaskRemoved(Intent rootIntent)
-    {
-        super.onTaskRemoved(rootIntent);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onTrimMemory(int level)
-    {
-        if (!QtLoader.invokeDelegate(level).invoked)
-            super.onTrimMemory(level);
-    }
-    public void super_onTrimMemory(int level)
-    {
-        super.onTrimMemory(level);
-    }
-    //---------------------------------------------------------------------------
 
     @Override
     public boolean onUnbind(Intent intent)
@@ -136,4 +84,5 @@ public class QtService extends Service
     {
         return super.onUnbind(intent);
     }
+    //---------------------------------------------------------------------------
 }