From 2154fe661e412cb32319c6b024fc4bcc9630f9d4 Mon Sep 17 00:00:00 2001 From: MarijnS95 Date: Wed, 4 Dec 2019 18:14:51 +0100 Subject: [PATCH] Drop useless isRunning boolean; startService only starts it once. A service can only be started once. After that, intents will be delivered to the onStartCommand function (if overridden). In the very unlikely event that the service dies and the bootreceiver receives an intent it is properly restarted again, instead of falsely being classified as running. Signed-off-by: MarijnS95 --- src/com/sony/qcrilam/BootReceiver.java | 8 ++------ src/com/sony/qcrilam/QcRilAmService.java | 6 ------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/com/sony/qcrilam/BootReceiver.java b/src/com/sony/qcrilam/BootReceiver.java index efba285..67b210b 100644 --- a/src/com/sony/qcrilam/BootReceiver.java +++ b/src/com/sony/qcrilam/BootReceiver.java @@ -14,11 +14,7 @@ public class BootReceiver extends BroadcastReceiver { Log.w(TAG, "BOOT_COMPLETE NULL intent"); return; } - if (QcRilAmService.isServiceRunning()) { - Log.d(TAG, "Service is already running"); - } else { - intent.setClass(context, QcRilAmService.class); - context.startService(new Intent(context, QcRilAmService.class)); - } + + context.startService(new Intent(context, QcRilAmService.class)); } } diff --git a/src/com/sony/qcrilam/QcRilAmService.java b/src/com/sony/qcrilam/QcRilAmService.java index 2faf4ef..471c0a9 100644 --- a/src/com/sony/qcrilam/QcRilAmService.java +++ b/src/com/sony/qcrilam/QcRilAmService.java @@ -12,11 +12,6 @@ import vendor.qti.hardware.radio.am.V1_0.IQcRilAudioCallback; public class QcRilAmService extends Service { private static final String TAG = "QcRilAm-Service"; - private static boolean isRunning = false; - - public static boolean isServiceRunning() { - return isRunning; - } private void addCallbackForSimSlot(final int simSlotNo, final AudioManager audioManager) { try { @@ -50,7 +45,6 @@ public class QcRilAmService extends Service { @Override public void onCreate() { - isRunning = true; int simCount = SubscriptionManager.from(this).getActiveSubscriptionInfoCountMax(); Log.i(TAG, "Device has " + simCount + " sim slots"); final AudioManager audioManager = getSystemService(AudioManager.class);