From f58174e4d625f1d8592e2c6518866da7840eb67d Mon Sep 17 00:00:00 2001 From: jyong15 Date: Fri, 1 Oct 2021 11:08:25 +0800 Subject: [PATCH 1/2] AA-251 Set BT_STATE.DISCONNECTED when lost connection to Shimmer --- .../src/main/java/com/shimmerresearch/android/Shimmer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java index b925d619..643ac10a 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java @@ -1170,9 +1170,9 @@ protected byte[] readBytes(int numberofBytes) { mInStream.readFully(b,0,numberofBytes); return(b); } catch (IOException e) { - System.out.println("Connection Lost"); e.printStackTrace(); + setBluetoothRadioState(BT_STATE.DISCONNECTED); } From aa43e8ff470f592bb34e2bd3c815a9efae7cbc29 Mon Sep 17 00:00:00 2001 From: jyong15 Date: Tue, 5 Oct 2021 10:45:52 +0800 Subject: [PATCH 2/2] AA-251 #time 20m Update to more appropriate disconnected method --- .../src/main/java/com/shimmerresearch/android/Shimmer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java index 643ac10a..7d8c3e68 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java @@ -1170,9 +1170,9 @@ protected byte[] readBytes(int numberofBytes) { mInStream.readFully(b,0,numberofBytes); return(b); } catch (IOException e) { + connectionLost(); System.out.println("Connection Lost"); e.printStackTrace(); - setBluetoothRadioState(BT_STATE.DISCONNECTED); }