Replace mainLooper with myLooper for non UI tasksissue/bugfix_1696

2 files changed, 12 insertions, 3 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
index 76f32b06d..31cea21c8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
@@ -348,7 +348,10 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport {
     }
 
     private void timerDelayRemoveDialog(final BluetoothSocket sock) {
-        timeOutHandler = new Handler(Looper.getMainLooper());
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        timeOutHandler = new Handler(Looper.myLooper());
         socketRunnable = new Runnable() {
             public void run() {
                 //Log.e(TAG, "BLUETOOTH SOCKET CONNECT TIMEOUT - ATTEMPT TO CLOSE SOCKET");
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
index 585ec241d..5b86d12a2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
@@ -2504,7 +2504,10 @@ public class SdlRouterService extends Service {
      * This method is used to check for the newest version of this class to make sure the latest and greatest is up and running.
      */
     private void startAltTransportTimer() {
-        altTransportTimerHandler = new Handler(Looper.getMainLooper());
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        altTransportTimerHandler = new Handler(Looper.myLooper());
         altTransportTimerRunnable = new Runnable() {
             public void run() {
                 altTransportTimerHandler = null;
@@ -3060,7 +3063,10 @@ public class SdlRouterService extends Service {
             this.messenger = messenger;
             this.sessionIds = new Vector<Long>();
             this.queues = new ConcurrentHashMap<>();
-            queueWaitHandler = new Handler(Looper.getMainLooper());
+            if (Looper.myLooper() == null) {
+                Looper.prepare();
+            }
+            queueWaitHandler = new Handler(Looper.myLooper());
             registeredTransports = new SparseArray<ArrayList<TransportType>>();
             awaitingSession = new Vector<>();
             setDeathNote(); //messaging Version