Add null check for BT device in SdlDeviceListenerfeature/sdl_0301_sdl_device_listener

1 files changed, 8 insertions, 0 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java
index a2b14ca4c..a396d186e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java
@@ -84,6 +84,14 @@ public class SdlDeviceListener {
      * will listen for 30 seconds, if it is not, this will listen for 15 seconds instead.
      */
     public void start() {
+        if(connectedDevice == null) {
+            DebugTool.logInfo(TAG + ": No supplied bluetooth device");
+            if(callback != null){
+                callback.onTransportError(null);
+            }
+            return;
+        }
+
         if (hasSDLConnected(contextWeakReference.get(), connectedDevice.getAddress())) {
             DebugTool.logInfo(TAG + ": Confirmed SDL device, should start router service");
             //This device has connected to SDL previously, it is ok to start the RS right now