From 529f8c453c6960acfd02d9f3ac842d71bb73d36b Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 11 Jul 2024 20:23:07 +0200
Subject: [PATCH] Android: Remove unused functions from AndroidConfig

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

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index eeca798d5bc..17843eeea57 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -41,7 +41,6 @@
 #include <QApplication>
 #include <QDirIterator>
 #include <QFileInfo>
-#include <QHostAddress>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -49,8 +48,6 @@
 #include <QRegularExpression>
 #include <QSettings>
 #include <QStandardPaths>
-#include <QStringList>
-#include <QTcpSocket>
 
 #include <functional>
 #include <memory>
@@ -285,33 +282,6 @@ static FilePath ndkSubPathFromQtVersion(const QtVersion &version)
 // AndroidConfig
 //////////////////////////////////
 
-QString getAvdName(const QString &serialnumber)
-{
-    const int index = serialnumber.indexOf(QLatin1String("-"));
-    if (index == -1)
-        return {};
-    bool ok;
-    const int port = serialnumber.mid(index + 1).toInt(&ok);
-    if (!ok)
-        return {};
-
-    QTcpSocket tcpSocket;
-    tcpSocket.connectToHost(QHostAddress(QHostAddress::LocalHost), port);
-    if (!tcpSocket.waitForConnected(100)) // Don't wait more than 100ms for a local connection
-        return {};
-
-    tcpSocket.write("avd name\nexit\n");
-    tcpSocket.waitForDisconnected(500);
-
-    const QByteArrayList response = tcpSocket.readAll().split('\n');
-    // The input "avd name" might not be echoed as-is, but contain ASCII control sequences.
-    for (int i = response.size() - 1; i > 1; --i) {
-        if (response.at(i).startsWith("OK"))
-            return QString::fromLatin1(response.at(i - 1)).trimmed();
-    }
-    return {};
-}
-
 QLatin1String displayName(const Abi &abi)
 {
     switch (abi.architecture()) {
@@ -699,17 +669,6 @@ ExecutableItem devicesCommandOutputRecipe(const Storage<QStringList> &outputStor
     return ProcessTask(onSetup, onDone);
 }
 
-bool isConnected(const QString &serialNumber)
-{
-    const QStringList lines = devicesCommandOutput();
-    for (const QString &line : lines) {
-        // skip the daemon logs
-        if (!line.startsWith("* daemon") && line.left(line.indexOf('\t')).trimmed() == serialNumber)
-            return true;
-    }
-    return false;
-}
-
 bool sdkFullyConfigured() { return config().m_sdkFullyConfigured; }
 
 void setSdkFullyConfigured(bool allEssentialsInstalled)
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index 735a6e3a738..f28c4ad67a3 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -16,8 +16,6 @@
 
 #include <utils/filepath.h>
 
-#include <QHash>
-#include <QMap>
 #include <QStringList>
 #include <QVersionNumber>
 
@@ -40,7 +38,6 @@ public:
 
 namespace AndroidConfig {
 
-QString getAvdName(const QString &serialnumber);
 QStringList apiLevelNamesFor(const SdkPlatformList &platforms);
 QString apiLevelNameFor(const SdkPlatform *platform);
 
@@ -99,7 +96,6 @@ QString bestNdkPlatformMatch(int target, const QtSupport::QtVersion *qtVersion);
 QLatin1String displayName(const ProjectExplorer::Abi &abi);
 
 QString getProductModel(const QString &device);
-bool isConnected(const QString &serialNumber);
 
 bool sdkFullyConfigured();
 void setSdkFullyConfigured(bool allEssentialsInstalled);