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

Android: findAvd() return serialNumber instead of bool

Browse Source 
So that the function can be reused by waitForAvd.

Change-Id: I0b7a86a13bf6a5f5b16d1d1cab362e7200a9a26f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2013-11-13 16:32:38 +01:00
parent f82bfeb41d
commit adc25d1e02
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -622,7 +622,7 @@ QVector<AndroidDeviceInfo> AndroidConfigurations::androidVirtualDevices() const
QString AndroidConfigurations::startAVD(const QString &name, int apiLevel, QString cpuAbi) 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 waitForAvd(apiLevel, cpuAbi);
return QString(); return QString();
} }
@@ -644,7 +644,7 @@ bool AndroidConfigurations::startAVDAsync(const QString &avdName) const
return true; return true;
} }
bool AndroidConfigurations::findAvd(int apiLevel, const QString &cpuAbi) const QString AndroidConfigurations::findAvd(int apiLevel, const QString &cpuAbi) const
{ {
QVector<AndroidDeviceInfo> devices = connectedDevices(); QVector<AndroidDeviceInfo> devices = connectedDevices();
foreach (AndroidDeviceInfo device, devices) { foreach (AndroidDeviceInfo device, devices) {
@@ -654,9 +654,9 @@ bool AndroidConfigurations::findAvd(int apiLevel, const QString &cpuAbi) const
continue; continue;
if (device.sdk != apiLevel) if (device.sdk != apiLevel)
continue; continue;
return true; return device.serialNumber;
} }
return false; return QString();
} }
QString AndroidConfigurations::waitForAvd(int apiLevel, const QString &cpuAbi) const QString AndroidConfigurations::waitForAvd(int apiLevel, const QString &cpuAbi) const

2
src/plugins/android/androidconfigurations.h
View File

@@ -106,7 +106,7 @@ public:
QVector<AndroidDeviceInfo> androidVirtualDevices() const; QVector<AndroidDeviceInfo> androidVirtualDevices() const;
QString startAVD(const QString &name, int apiLevel, QString cpuAbi) const; QString startAVD(const QString &name, int apiLevel, QString cpuAbi) const;
bool startAVDAsync(const QString &avdName) 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 waitForAvd(int apiLevel, const QString &cpuAbi) const;
QString bestNdkPlatformMatch(const QString &targetAPI) const; QString bestNdkPlatformMatch(const QString &targetAPI) const;

2
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -287,7 +287,7 @@ bool AndroidDeployQtStep::init()
if (!result) if (!result)
return false; return false;
if (!AndroidConfigurations::instance().findAvd(m_deviceAPILevel, m_targetArch)) if (AndroidConfigurations::instance().findAvd(m_deviceAPILevel, m_targetArch).isEmpty())
AndroidConfigurations::instance().startAVDAsync(m_avdName); AndroidConfigurations::instance().startAVDAsync(m_avdName);
return true; return true;
} }

2
src/plugins/android/androiddeploystep.cpp
View File

@@ -389,7 +389,7 @@ void AndroidDeployStep::deployFiles(QProcess *process, const QList<DeployItem> &
bool AndroidDeployStep::deployPackage() bool AndroidDeployStep::deployPackage()
{ {
if (!m_avdName.isEmpty()) { 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)) && !AndroidConfigurations::instance().startAVDAsync(m_avdName))
return false; return false;
m_deviceSerialNumber = AndroidConfigurations::instance().waitForAvd(m_deviceAPILevel, m_targetArch); m_deviceSerialNumber = AndroidConfigurations::instance().waitForAvd(m_deviceAPILevel, m_targetArch);