From 7449297dc4c57fd0e5fc0f2bc0a4528255a96fe3 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Wed, 3 Jul 2013 17:16:10 +0200
Subject: [PATCH] Android: Remove apiLevel parameter from connectedDevices
Both callers do filtering on the api level afterwards, so it pratically
serves no purpose.
Change-Id: I8f54f9050a66185a3799ea5b5446dec935d2d5ac
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
---
src/plugins/android/androidconfigurations.cpp | 6 ++----
src/plugins/android/androidconfigurations.h | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 0b72f1a6b2d..9dc6666507e 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -391,7 +391,7 @@ QString AndroidConfigurations::getDeployDeviceSerialNumber(int *apiLevel, const
return QString();
}
-QVector<AndroidDeviceInfo> AndroidConfigurations::connectedDevices(int apiLevel) const
+QVector<AndroidDeviceInfo> AndroidConfigurations::connectedDevices() const
{
QVector<AndroidDeviceInfo> devices;
QProcess adbProc;
@@ -422,8 +422,6 @@ QVector<AndroidDeviceInfo> AndroidConfigurations::connectedDevices(int apiLevel)
dev.serialNumber = serialNo;
dev.sdk = getSDKVersion(dev.serialNumber);
dev.cpuABI = getAbis(dev.serialNumber);
- if (apiLevel != -1 && dev.sdk != apiLevel)
- continue;
devices.push_back(dev);
}
qSort(devices.begin(), devices.end(), androidDevicesLessThan);
@@ -581,7 +579,7 @@ QString AndroidConfigurations::startAVD(int *apiLevel, const QString &name) cons
}
// get connected devices
- devices = connectedDevices(*apiLevel);
+ devices = connectedDevices();
foreach (AndroidDeviceInfo device, devices)
if (device.sdk == *apiLevel)
return device.serialNumber;
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index 17bf34bc6a3..4c1f934b4fe 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -95,7 +95,7 @@ public:
QString getDeployDeviceSerialNumber(int *apiLevel, const QString &abi) const;
bool createAVD(const QString &target, const QString &name, int sdcardSize) const;
bool removeAVD(const QString &name) const;
- QVector<AndroidDeviceInfo> connectedDevices(int apiLevel = -1) const;
+ QVector<AndroidDeviceInfo> connectedDevices() const;
QVector<AndroidDeviceInfo> androidVirtualDevices() const;
QString startAVD(int *apiLevel, const QString &name = QString()) const;
QString bestMatch(const QString &targetAPI) const;
--
GitLab