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 AndroidConfigurations::connectedDevices(int apiLevel) const +QVector AndroidConfigurations::connectedDevices() const { QVector devices; QProcess adbProc; @@ -422,8 +422,6 @@ QVector 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 connectedDevices(int apiLevel = -1) const; + QVector connectedDevices() const; QVector androidVirtualDevices() const; QString startAVD(int *apiLevel, const QString &name = QString()) const; QString bestMatch(const QString &targetAPI) const;