Surround body of bluetoothAvailable() with try/catchbugfix/issue_378

Catch NPE and return false if caught. Only meant to catch NPE in isEnabled() call.

1 files changed, 8 insertions, 3 deletions

diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java b/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java
index 608855631..514385ffa 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java
+++ b/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java
@@ -1024,9 +1024,14 @@ public class SdlRouterService extends Service{
 	 * @return
 	 */
 	private boolean bluetoothAvailable(){
-		boolean retVal = (!(BluetoothAdapter.getDefaultAdapter()==null) && BluetoothAdapter.getDefaultAdapter().isEnabled());
-		//Log.d(TAG, "Bluetooth Available? - " + retVal);
-		return retVal;
+		try {
+			boolean retVal = (!(BluetoothAdapter.getDefaultAdapter() == null) && BluetoothAdapter.getDefaultAdapter().isEnabled());
+			//Log.d(TAG, "Bluetooth Available? - " + retVal);
+			return retVal;
+		}catch(NullPointerException e){ // only for BluetoothAdapter.getDefaultAdapter().isEnabled() call
+			Log.e(TAG, "NPE when checking for BT");
+			return false;
+		}
 	}
 
 	/**