feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Fix connecting to debug server using adb over WiFi

Browse Source 
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 <alessandro.portale@qt.io>
This commit is contained in:
Adam Sowa
2022-10-20 16:15:02 +02:00
committed by Przemysław Adam Sowa
parent 698583dc01
commit fb40998549
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/androiddebugsupport.cpp
View File

@@ -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;