Merge pull request #90 from ShimmerEngineering/DEV-257

DEV-257

Author: JongChern

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java

@@ -1082,7 +1082,8 @@ public ConnectThread(BluetoothDevice device) {
 			// Get a BluetoothSocket for a connection with the
 			// given BluetoothDevice
 			try {
-				tmp = device.createInsecureRfcommSocketToServiceRecord(mSPP_UUID); // If your device fails to pair try: device.createInsecureRfcommSocketToServiceRecord(mSPP_UUID)
+				//tmp = device.createInsecureRfcommSocketToServiceRecord(mSPP_UUID);
+				tmp = device.createRfcommSocketToServiceRecord (mSPP_UUID); // If your device fails to pair try: device.createInsecureRfcommSocketToServiceRecord(mSPP_UUID)
 			} catch (IOException e) {
 				connectionLost();
 

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/ShimmerSerialPortAndroid.java

@@ -82,7 +82,8 @@ public void connect(){
     private void createBluetoothSocket() {
         try {
             device = mBluetoothAdapter.getRemoteDevice(mBluetoothAddress);
-            mBluetoothSocket = device.createInsecureRfcommSocketToServiceRecord(mSPP_UUID); // If your device fails to pair try: device.createInsecureRfcommSocketToServiceRecord(mSPP_UUID)
+            //mBluetoothSocket = device.createInsecureRfcommSocketToServiceRecord(mSPP_UUID);
+            mBluetoothSocket = device.createRfcommSocketToServiceRecord(mSPP_UUID);// If your device fails to pair try: device.createInsecureRfcommSocketToServiceRecord(mSPP_UUID)
         } catch (IOException e) {
             catchException(e, ErrorCodesSerialPort.SHIMMERUART_COMM_ERR_PORT_EXCEPTON_OPENING);
         }