Move legacy mode modifications to single points (#1704)

Author: joeygrover

android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java

@@ -119,8 +119,7 @@ public void close(long sessionId) {
             transport.removeSession(sessionId);
             transport.stop();
         } else if (legacyBluetoothTransport != null) {
-            legacyBluetoothTransport.stop();
-            legacyBluetoothTransport = null;
+            exitLegacyMode(null);
         }
     }
 
@@ -426,25 +425,32 @@ public void run() {
         }
     }
 
+    /**
+     * A synchronized method to exit out of legacy mode
+     * @param info if this is null, the transport listener callback will not be called
+     */
     @Override
     synchronized void exitLegacyMode(String info) {
-        TransportRecord legacyTransportRecord = null;
-        if (legacyBluetoothTransport != null) {
-            legacyTransportRecord = legacyBluetoothTransport.getTransportRecord();
+        if (legacyBluetoothTransport != null) { //If this is null, there is no reason to proceed
+            TransportRecord legacyTransportRecord = legacyBluetoothTransport.getTransportRecord();
             legacyBluetoothTransport.stop();
             legacyBluetoothTransport = null;
-        }
-        legacyBluetoothHandler = null;
-        synchronized (TRANSPORT_STATUS_LOCK) {
-            TransportManager.this.transportStatus.clear();
-        }
-        if (contextWeakReference != null) {
-            try {
-                contextWeakReference.get().unregisterReceiver(legacyDisconnectReceiver);
-            } catch (Exception e) {
+
+            legacyBluetoothHandler = null;
+            synchronized (TRANSPORT_STATUS_LOCK) {
+                TransportManager.this.transportStatus.clear();
+            }
+            if (contextWeakReference != null) {
+                try {
+                    contextWeakReference.get().unregisterReceiver(legacyDisconnectReceiver);
+                } catch (Exception e) {
+                    DebugTool.logError(TAG, "Error attempting to unregister legacy mode receiver", e);
+                }
+            }
+            if (transportListener != null && info != null) {
+                transportListener.onTransportDisconnected(info, legacyTransportRecord, null);
             }
         }
-        transportListener.onTransportDisconnected(info, legacyTransportRecord, null);
     }