commit 754b6ea089e9f7ed33fffabe7b5a14981ec66f87
author George G <kreach3r@users.noreply.github.com> Tue Apr 11 19:37:18 2017 +0300
committer Nathan Chancellor <natechancellor@gmail.com> Tue Apr 11 17:27:42 2017 -0700
tree 3be6b3e805ea73eb42a2def2e3fe0eca45975ee8
parent 31b36ca6276f1e972dfa6dcfc34abc1c8d54d457

restartService --> forceStopService

JobService shouldn't need to be restarted, but simply killed.
Restarting the service presents requires an app to call the service
start intent, which right now was interfacer itself, and it got
caught in our Signature check (as it isn't Substratum's check).

When a new job intent is broadcasted, JobService should be launched
(restarted) automatically anyway.

Change-Id: If0bb66fa7481b1865686e0b1393a270a8c3df0ba

app/src/main/AndroidManifest.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d8a1dd8..e2709b6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,8 +4,8 @@
           coreApp="true"
           package="projekt.interfacer"
           android:sharedUserId="android.uid.system"
-          android:versionCode="50"
-          android:versionName="fifty"
+          android:versionCode="56"
+          android:versionName="fifty six"
           tools:ignore="GradleOverrides">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

app/src/main/java/projekt/interfacer/services/JobService.java

diff --git a/app/src/main/java/projekt/interfacer/services/JobService.java b/app/src/main/java/projekt/interfacer/services/JobService.java
index 755fa55..83f2dc0 100644
--- a/app/src/main/java/projekt/interfacer/services/JobService.java
+++ b/app/src/main/java/projekt/interfacer/services/JobService.java
@@ -95,7 +95,7 @@
     public static final String COMMAND_VALUE_INSTALL = "install";
     public static final String COMMAND_VALUE_UNINSTALL = "uninstall";
     public static final String COMMAND_VALUE_RESTART_UI = "restart_ui";
-    public static final String COMMAND_VALUE_RESTART_SERVICE = "restart_service";
+    public static final String COMMAND_VALUE_FORCE_STOP_SERVICE = "force_stop_service";
     public static final String COMMAND_VALUE_CONFIGURATION_SHIM = "configuration_shim";
     public static final String COMMAND_VALUE_BOOTANIMATION = "bootanimation";
     public static final String COMMAND_VALUE_FONTS = "fonts";
@@ -134,7 +134,6 @@
     private MainHandler mMainHandler;
     private long mLastJobTime;
     private boolean mIsRunning;
-    private boolean mShouldRestartService;
 
     private static IOverlayManager getOMS() {
         if (mOMS == null) {
@@ -220,9 +219,9 @@
             }
         } else if (TextUtils.equals(command, COMMAND_VALUE_RESTART_UI)) {
             jobs_to_add.add(new UiResetJob());
-        } else if (TextUtils.equals(command, COMMAND_VALUE_RESTART_SERVICE)) {
-            log("Restarting JobService...");
-            restartService();
+        } else if (TextUtils.equals(command, COMMAND_VALUE_FORCE_STOP_SERVICE)) {
+            log("Force stopping JobService...");
+            forceStopService();
         } else if (TextUtils.equals(command, COMMAND_VALUE_CONFIGURATION_SHIM)) {
             jobs_to_add.add(new LocaleChanger(getApplicationContext(), mMainHandler));
         } else if (TextUtils.equals(command, COMMAND_VALUE_BOOTANIMATION)) {
@@ -318,17 +317,6 @@
         return null;
     }
 
-    @Override
-    public void onDestroy() {
-       if (mShouldRestartService) {
-           Intent intent = new Intent(this, JobService.class);
-           PendingIntent pending = PendingIntent.getActivity(this, 0, new Intent(), 0);
-           intent.putExtra(INTERFACER_TOKEN, pending);
-           intent.putExtra(JOB_TIME_KEY, System.currentTimeMillis());
-           startService(intent);
-       }
-    }
-
     private boolean isProcessing() {
         return mJobQueue.size() > 0;
     }
@@ -664,8 +652,7 @@
         }
     }
 
-    private void restartService() {
-        mShouldRestartService = true;
+    private void forceStopService() {
         stopService(new Intent(this, JobService.class));
     }