From fb40998549ee54c439c6d853319ad6f9fcc6e615 Mon Sep 17 00:00:00 2001 From: Adam Sowa Date: Thu, 20 Oct 2022 16:15:02 +0200 Subject: [PATCH] Android: Fix connecting to debug server using adb over WiFi Remove port number from ADB's device serial number when setting remote channel for debugging. Fixes: QTCREATORBUG-28342 Change-Id: I8b979af38aea5167693cb319a0a18490963b115a Reviewed-by: Alessandro Portale --- src/plugins/android/androiddebugsupport.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 3785e7d9a56..19803cb7b68 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -138,7 +138,14 @@ void AndroidDebugSupport::start() setAbi(AndroidManager::androidAbi2Abi(devicePreferredAbi)); if (cppEngineType() == LldbEngineType) { - setRemoteChannel("adb://" + AndroidManager::deviceSerialNumber(target), + QString deviceSerialNumber = AndroidManager::deviceSerialNumber(target); + const int colonPos = deviceSerialNumber.indexOf(QLatin1Char(':')); + if (colonPos > 0) { + // When wireless debugging is used then the device serial number will include a port number + // The port number must be removed to form a valid hostname + deviceSerialNumber.truncate(colonPos); + } + setRemoteChannel("adb://" + deviceSerialNumber, m_runner->debugServerPort().number()); } else { QUrl debugServer;