From 5a12b3618f5c3af3b200a842cd6f972b7a8906c8 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 21 May 2024 21:15:08 +0200
Subject: [PATCH] Android: Get rid of connectedDevices()

Change-Id: Ib803c2f7cfb6db71a9b35716aca1663a7ce0176a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidconfigurations.cpp | 55 -------------------
 src/plugins/android/androidconfigurations.h   |  2 -
 2 files changed, 57 deletions(-)

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 97f31550c50..86e1d57b234 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -674,61 +674,6 @@ FilePath keytoolPath()
     return openJDKBinPath().pathAppended(keytoolName).withExecutableSuffix();
 }
 
-QList<AndroidDeviceInfo> connectedDevices(QString *error)
-{
-    QList<AndroidDeviceInfo> devices;
-    Process adbProc;
-    CommandLine cmd{adbToolPath(), {"devices"}};
-    adbProc.setCommand(cmd);
-    using namespace std::chrono_literals;
-    adbProc.runBlocking(30s);
-    if (adbProc.result() != ProcessResult::FinishedWithSuccess) {
-        if (error)
-            *error = Tr::tr("Could not run: %1").arg(cmd.toUserOutput());
-        return devices;
-    }
-    QStringList adbDevs = adbProc.allOutput().split('\n', Qt::SkipEmptyParts);
-    if (adbDevs.empty())
-        return devices;
-
-    for (const QString &line : adbDevs) // remove the daemon logs
-        if (line.startsWith("* daemon"))
-            adbDevs.removeOne(line);
-    adbDevs.removeFirst(); // remove "List of devices attached" header line
-
-    // workaround for '????????????' serial numbers:
-    // can use "adb -d" when only one usb device attached
-    for (const QString &device : std::as_const(adbDevs)) {
-        const QString serialNo = device.left(device.indexOf('\t')).trimmed();
-        const QString deviceType = device.mid(device.indexOf('\t')).trimmed();
-        AndroidDeviceInfo dev;
-        dev.serialNumber = serialNo;
-        dev.type = serialNo.startsWith(QLatin1String("emulator")) ? IDevice::Emulator
-                                                                  : IDevice::Hardware;
-        dev.sdk = getSDKVersion(dev.serialNumber);
-        dev.cpuAbi = getAbis(dev.serialNumber);
-        if (deviceType == QLatin1String("unauthorized"))
-            dev.state = IDevice::DeviceConnected;
-        else if (deviceType == QLatin1String("offline"))
-            dev.state = IDevice::DeviceDisconnected;
-        else
-            dev.state = IDevice::DeviceReadyToUse;
-
-        if (dev.type == IDevice::Emulator) {
-            dev.avdName = getAvdName(dev.serialNumber);
-            if (dev.avdName.isEmpty())
-                dev.avdName = serialNo;
-        }
-
-        devices.push_back(dev);
-    }
-
-    Utils::sort(devices);
-    if (devices.isEmpty() && error)
-        *error = Tr::tr("No devices found in output of: %1").arg(cmd.toUserOutput());
-    return devices;
-}
-
 bool isConnected(const QString &serialNumber)
 {
     Process adbProcess;
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index ec3a441ed32..5e50dab0cd0 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -89,8 +89,6 @@ Utils::FilePath makePathFromNdk(const Utils::FilePath &ndkLocation);
 
 Utils::FilePath keytoolPath();
 
-QList<AndroidDeviceInfo> connectedDevices(QString *error = nullptr);
-
 QString bestNdkPlatformMatch(int target, const QtSupport::QtVersion *qtVersion);
 
 QLatin1String displayName(const ProjectExplorer::Abi &abi);