Merge pull request #454 from smartdevicelink/revert-432-bugfix/issue_431

joeygrover · web-flow · commit 83dcafe16d3d · 2017-04-06T11:02:01.000-04:00
Revert "Bugfix/issue 431"
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
@@ -1401,7 +1401,7 @@ protected void cycleProxy(SdlDisconnectedReason disconnectedReason) {
 				_cycling = true;
 				cleanProxy(disconnectedReason);
 				initializeProxy();
-				if(!SdlDisconnectedReason.LEGACY_BLUETOOTH_MODE_ENABLED.equals(disconnectedReason) && !_transportConfig.getTransportType().equals(TransportType.MULTIPLEX)){
+				if(!SdlDisconnectedReason.LEGACY_BLUETOOTH_MODE_ENABLED.equals(disconnectedReason)){//We don't want to alert higher if we are just cycling for legacy bluetooth
 					notifyProxyClosed("Sdl Proxy Cycled", new SdlException("Sdl Proxy Cycled", SdlExceptionCause.SDL_PROXY_CYCLED), disconnectedReason);							
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -1401,7 +1401,7 @@ protected void cycleProxy(SdlDisconnectedReason disconnectedReason) {`
`1401`	`1401`	`_cycling = true;`
`1402`	`1402`	`cleanProxy(disconnectedReason);`
`1403`	`1403`	`initializeProxy();`
`1404`		`- if(!SdlDisconnectedReason.LEGACY_BLUETOOTH_MODE_ENABLED.equals(disconnectedReason) && !_transportConfig.getTransportType().equals(TransportType.MULTIPLEX)){`
	`1404`	`+ if(!SdlDisconnectedReason.LEGACY_BLUETOOTH_MODE_ENABLED.equals(disconnectedReason)){//We don't want to alert higher if we are just cycling for legacy bluetooth`
`1405`	`1405`	`notifyProxyClosed("Sdl Proxy Cycled", new SdlException("Sdl Proxy Cycled", SdlExceptionCause.SDL_PROXY_CYCLED), disconnectedReason);`
`1406`	`1406`	`}`
`1407`	`1407`	`}`