Merge pull request #1766 from smartdevicelink/bugfix/issue_1661

bilal-alsharifi · web-flow · commit b2b1e5954ff8 · 2021-12-14T09:48:32.000-05:00
Add Bluetooth adapter available check in RouterService for spp error notification
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
@@ -1942,7 +1942,7 @@ public void onTransportError(TransportRecord transport, Bundle errorBundle) {
                     bluetoothTransport.setStateManually(MultiplexBluetoothTransport.STATE_NONE);
                     bluetoothTransport = null;
                 }
-                if (errorBundle != null && errorBundle.getByte(MultiplexBaseTransport.ERROR_REASON_KEY) == MultiplexBaseTransport.REASON_SPP_ERROR) {
+                if (errorBundle != null && errorBundle.getByte(MultiplexBaseTransport.ERROR_REASON_KEY) == MultiplexBaseTransport.REASON_SPP_ERROR && bluetoothAvailable()) {
                     notifySppError();
                 }
                 break;

Original file line number	Diff line number	Diff line change
`@@ -1942,7 +1942,7 @@ public void onTransportError(TransportRecord transport, Bundle errorBundle) {`
`1942`	`1942`	`bluetoothTransport.setStateManually(MultiplexBluetoothTransport.STATE_NONE);`
`1943`	`1943`	`bluetoothTransport = null;`
`1944`	`1944`	`}`
`1945`		`- if (errorBundle != null && errorBundle.getByte(MultiplexBaseTransport.ERROR_REASON_KEY) == MultiplexBaseTransport.REASON_SPP_ERROR) {`
	`1945`	`+ if (errorBundle != null && errorBundle.getByte(MultiplexBaseTransport.ERROR_REASON_KEY) == MultiplexBaseTransport.REASON_SPP_ERROR && bluetoothAvailable()) {`
`1946`	`1946`	`notifySppError();`
`1947`	`1947`	`}`
`1948`	`1948`	`break;`