Update ShimmerDriver/src/main/java/com/shimmerresearch/bluetooth/ShimmerBluetooth.java

marknolan · Copilot · web-flow · commit 992069d16df6 · 2025-12-03T10:50:52.000Z
Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/bluetooth/ShimmerBluetooth.java b/ShimmerDriver/src/main/java/com/shimmerresearch/bluetooth/ShimmerBluetooth.java
@@ -1310,7 +1310,7 @@ protected void discardBufferBytesToNextPacket(){
 		mByteArrayOutputStream.write(bTemp, offset, bTemp.length-offset); // discard first 'offset' bytes
 		if(mEnablePCTimeStamps) {
 			// Remove first `offset` elements from the original list (destructive, modifies same list)
-			mListofPCTimeStamps.subList(0, offset).clear();
+			mListofPCTimeStamps.subList(0, Math.min(offset, mListofPCTimeStamps.size())).clear();
 		}
 		consolePrintLn("Throw Bytes " + UtilShimmer.bytesToHexStringWithSpacesFormatted(Arrays.copyOfRange(bTemp, 0, offset)));
 	}

Original file line number	Diff line number	Diff line change
`@@ -1310,7 +1310,7 @@ protected void discardBufferBytesToNextPacket(){`
`1310`	`1310`	`mByteArrayOutputStream.write(bTemp, offset, bTemp.length-offset); // discard first 'offset' bytes`
`1311`	`1311`	`if(mEnablePCTimeStamps) {`
`1312`	`1312`	// Remove first `offset` elements from the original list (destructive, modifies same list)
`1313`		`- mListofPCTimeStamps.subList(0, offset).clear();`
	`1313`	`+ mListofPCTimeStamps.subList(0, Math.min(offset, mListofPCTimeStamps.size())).clear();`
`1314`	`1314`	`}`
`1315`	`1315`	`consolePrintLn("Throw Bytes " + UtilShimmer.bytesToHexStringWithSpacesFormatted(Arrays.copyOfRange(bTemp, 0, offset)));`
`1316`	`1316`	`}`