From adc25d1e025f8491993a00e1fda7d9dfa3b153f8 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 13 Nov 2013 16:32:38 +0100 Subject: [PATCH] Android: findAvd() return serialNumber instead of bool So that the function can be reused by waitForAvd. Change-Id: I0b7a86a13bf6a5f5b16d1d1cab362e7200a9a26f Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/android/androidconfigurations.cpp | 8 ++++---- src/plugins/android/androidconfigurations.h | 2 +- src/plugins/android/androiddeployqtstep.cpp | 2 +- src/plugins/android/androiddeploystep.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 592847a6b1b..e6e2e7a6ab0 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -622,7 +622,7 @@ QVector AndroidConfigurations::androidVirtualDevices() const QString AndroidConfigurations::startAVD(const QString &name, int apiLevel, QString cpuAbi) const { - if (findAvd(apiLevel, cpuAbi) || startAVDAsync(name)) + if (!findAvd(apiLevel, cpuAbi).isEmpty() || startAVDAsync(name)) return waitForAvd(apiLevel, cpuAbi); return QString(); } @@ -644,7 +644,7 @@ bool AndroidConfigurations::startAVDAsync(const QString &avdName) const return true; } -bool AndroidConfigurations::findAvd(int apiLevel, const QString &cpuAbi) const +QString AndroidConfigurations::findAvd(int apiLevel, const QString &cpuAbi) const { QVector devices = connectedDevices(); foreach (AndroidDeviceInfo device, devices) { @@ -654,9 +654,9 @@ bool AndroidConfigurations::findAvd(int apiLevel, const QString &cpuAbi) const continue; if (device.sdk != apiLevel) continue; - return true; + return device.serialNumber; } - return false; + return QString(); } QString AndroidConfigurations::waitForAvd(int apiLevel, const QString &cpuAbi) const diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 38af17330fe..faa6518541b 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -106,7 +106,7 @@ public: QVector androidVirtualDevices() const; QString startAVD(const QString &name, int apiLevel, QString cpuAbi) const; bool startAVDAsync(const QString &avdName) const; - bool findAvd(int apiLevel, const QString &cpuAbi) const; + QString findAvd(int apiLevel, const QString &cpuAbi) const; QString waitForAvd(int apiLevel, const QString &cpuAbi) const; QString bestNdkPlatformMatch(const QString &targetAPI) const; diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 4e9498ecdbb..37ebf3f918b 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -287,7 +287,7 @@ bool AndroidDeployQtStep::init() if (!result) return false; - if (!AndroidConfigurations::instance().findAvd(m_deviceAPILevel, m_targetArch)) + if (AndroidConfigurations::instance().findAvd(m_deviceAPILevel, m_targetArch).isEmpty()) AndroidConfigurations::instance().startAVDAsync(m_avdName); return true; } diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp index d971eb6e714..b33272adb69 100644 --- a/src/plugins/android/androiddeploystep.cpp +++ b/src/plugins/android/androiddeploystep.cpp @@ -389,7 +389,7 @@ void AndroidDeployStep::deployFiles(QProcess *process, const QList & bool AndroidDeployStep::deployPackage() { if (!m_avdName.isEmpty()) { - if (!AndroidConfigurations::instance().findAvd(m_deviceAPILevel, m_targetArch) + if (AndroidConfigurations::instance().findAvd(m_deviceAPILevel, m_targetArch).isEmpty() && !AndroidConfigurations::instance().startAVDAsync(m_avdName)) return false; m_deviceSerialNumber = AndroidConfigurations::instance().waitForAvd(m_deviceAPILevel, m_targetArch);