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

Android: Remove apiLevel parameter from connectedDevices

Browse Source 
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>
This commit is contained in:
Daniel Teske
2013-07-03 17:16:10 +02:00
parent 16908f5733
commit 7449297dc4
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidconfigurations.cpp
View File

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