Cleanup where looper was already prepared

3 files changed, 4 insertions, 10 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
index f06a5a05a..3eba6af30 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
@@ -337,9 +337,6 @@ public class VirtualDisplayEncoder {
             Looper.prepare();
 
             // create a Handler for this thread
-            if (Looper.myLooper() == null) {
-                Looper.prepare();
-            }
             mHandler = new Handler(Looper.myLooper()) {
                 public void handleMessage(Message msg) {
                     switch (msg.what) {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
index 5bfd0c33f..831e59da4 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
@@ -155,7 +155,7 @@ public class HeartbeatMonitor implements IHeartbeatMonitor {
                         Looper.prepare();

                         mHeartbeatThreadLooper = Looper.myLooper();

 

-                        mHeartbeatThreadHandler = new Handler(Looper.getMainLooper());

+                        mHeartbeatThreadHandler = new Handler(mHeartbeatThreadLooper);

                         mIsAckReceived = true;

                         isHeartbeatReceived = true;

 

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
index 04f5b5079..6c3050301 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
@@ -402,10 +402,10 @@ public class TransportManager extends TransportManagerBase {
             return; //Already in legacy mode
         }
 
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
         if (transportListener.onLegacyModeEnabled(info)) {
-            if (Looper.myLooper() == null) {
-                Looper.prepare();
-            }
             legacyBluetoothHandler = new LegacyBluetoothHandler(this);
             legacyBluetoothTransport = new MultiplexBluetoothTransport(legacyBluetoothHandler);
             if (contextWeakReference.get() != null) {
@@ -415,9 +415,6 @@ public class TransportManager extends TransportManagerBase {
                 contextWeakReference.get().registerReceiver(legacyDisconnectReceiver, intentFilter);
             }
         } else {
-            if (Looper.myLooper() == null) {
-                Looper.prepare();
-            }
             new Handler(Looper.myLooper()).postDelayed(new Runnable() {
                 @Override
                 public void run() {