Added queryUsbAcc flag to transport config. Removed static boolean from usb transport.

2 files changed, 10 insertions, 7 deletions

diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/USBTransport.java b/sdl_android_lib/src/com/smartdevicelink/transport/USBTransport.java
index 23736f93f..602643b0d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/USBTransport.java
+++ b/sdl_android_lib/src/com/smartdevicelink/transport/USBTransport.java
@@ -37,8 +37,6 @@ public class USBTransport extends SdlTransport {
 

 	// Boolean to monitor if the transport is in a disconnecting state

 	private boolean _disconnecting = false;

-	// Boolean to keep track of the initial connection used in initializeAccessory

-	private static boolean firstConnect = true;

 	/**

      * Broadcast action: sent when a USB accessory is attached.

      *

@@ -458,11 +456,10 @@ public class USBTransport extends SdlTransport {
      * Looks for an already connected compatible accessory and connect to it.

      */

     private void initializeAccessory() {

-	    if (!firstConnect) return;

         

 		logI("Looking for connected accessories");

         UsbAccessory acc =  mConfig.getUsbAccessory();

-        if(acc == null || !isAccessorySupported(acc)){ //Check to see if our config included an accessory and that it is supported. If not, see if there are any other accessories connected.

+        if( (acc == null && mConfig.getQueryUsbAcc()) || !isAccessorySupported(acc)){ //Check to see if our config included an accessory and that it is supported. If not, see if there are any other accessories connected.

 			UsbManager usbManager = getUsbManager();

          	UsbAccessory[] accessories = usbManager.getAccessoryList();

          	if (accessories != null) {

@@ -742,7 +739,6 @@ public class USBTransport extends SdlTransport {
                     }

 

                     logI("Accessory opened!");

-					firstConnect = false;

                     

 					synchronized (USBTransport.this) {

                         setState(State.CONNECTED);

diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/USBTransportConfig.java b/sdl_android_lib/src/com/smartdevicelink/transport/USBTransportConfig.java
index baf0dafac..7e6e416ee 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/USBTransportConfig.java
+++ b/sdl_android_lib/src/com/smartdevicelink/transport/USBTransportConfig.java
@@ -9,6 +9,7 @@ public class USBTransportConfig extends BaseTransportConfig {
 	

 	private Context mainActivity = null;

 	private UsbAccessory usbAccessory = null;

+	private Boolean queryUsbAcc = true;

 	

 	public USBTransportConfig (Context mainActivity) {

 		this.mainActivity = mainActivity;

@@ -19,17 +20,23 @@ public class USBTransportConfig extends BaseTransportConfig {
 		this.usbAccessory = usbAccessory;

 	}

 	

-	public USBTransportConfig (Context mainActivity, boolean shareConnection) {

+	public USBTransportConfig (Context mainActivity, boolean shareConnection, boolean queryUsbAcc) {

 		this.mainActivity = mainActivity;

+		this.queryUsbAcc = queryUsbAcc;

 		super.shareConnection = shareConnection;

 	}

 	

-	public USBTransportConfig (Context mainActivity, UsbAccessory usbAccessory, boolean shareConnection) {

+	public USBTransportConfig (Context mainActivity, UsbAccessory usbAccessory, boolean shareConnection, boolean queryUsbAcc) {

 		this.mainActivity = mainActivity;

+		this.queryUsbAcc = queryUsbAcc;

 		this.usbAccessory = usbAccessory;

 		super.shareConnection = shareConnection;

 	}

 	

+	public Boolean getQueryUsbAcc () {

+		return queryUsbAcc;

+	}

+	

 	public Context getUSBContext () {

 		return mainActivity;

 	}