Skip to content

Commit 51195f1

Browse files
committed
bluetooth: don't treat unexpected messages as errors
AndroidAuto APK or Android 16 (not sure) changed something in the BT handshake so it is repeating responses, like below: ``` 1970-01-01, 00:00:13.388 [INFO] bluetooth: 🛜 Sending Host IP Address: 10.0.0.1 1970-01-01, 00:00:13.399 [INFO] bluetooth: 📨 stage #1 of 5: Sending WifiStartRequest frame to phone... 1970-01-01, 00:00:13.554 [WARN] unexpected MessageID = 7, len = 2, ignoring 1970-01-01, 00:00:13.554 [INFO] bluetooth: 📨 stage #2 of 5: Received WifiInfoRequest frame from phone (⏱️ 152 ms) 1970-01-01, 00:00:13.555 [INFO] bluetooth: 🛜 Sending Host SSID and Password: AAWirelessDongle 1970-01-01, 00:00:13.556 [INFO] bluetooth: 📨 stage #3 of 5: Sending WifiInfoResponse frame to phone... 1970-01-01, 00:00:13.556 [WARN] unexpected MessageID = 2, len = 0, ignoring 1970-01-01, 00:00:13.557 [INFO] bluetooth: 📨 stage #4 of 5: Received WifiStartResponse frame from phone (⏱️ 0 ms) 1970-01-01, 00:00:23.298 [INFO] bluetooth: 📨 stage #5 of 5: Received WifiConnectStatus frame from phone (⏱️ 9740 ms) ``` This commit is making a workaround for this problem.
1 parent ffbe91e commit 51195f1

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/bluetooth.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,10 @@ async fn read_message(
294294
debug!("MessageID = {}, len = {}", message_id, len);
295295

296296
if message_id != id.clone() as u16 {
297-
return Err(format!(
297+
warn!(
298298
"Received data has invalid MessageID: got: {:?}, expected: {:?}",
299-
message_id, id,
300-
)
301-
.into());
299+
message_id, id
300+
);
302301
}
303302
info!(
304303
"{} 📨 stage #{} of {}: Received <yellow>{:?}</> frame from phone (⏱️ {} ms)",

0 commit comments

Comments
 (0)