Commit 7449297d authored by Daniel Teske's avatar Daniel Teske

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: default avatarNikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: default avatarEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
parent 16908f57
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment