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

Android: Make getDeployDeviceSerialNumber not start a avd automatically

Browse Source 
This allows the caller to do that as a fallback.

Change-Id: Ifd50036317c7df4fe77fc34ea0f616c07611a517
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 16:53:49 +02:00
parent 8685ff8a28
commit 16908f5733
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,7 +388,7 @@ QString AndroidConfigurations::getDeployDeviceSerialNumber(int *apiLevel, const
return device.serialNumber;
}
}
return startAVD(apiLevel);
return QString();
}
QVector<AndroidDeviceInfo> AndroidConfigurations::connectedDevices(int apiLevel) const

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

@@ -102,6 +102,8 @@ bool AndroidDeployStep::init()
writeOutput(tr("Please wait, searching for a suitable device for target:%1.").arg(targetSDK));
m_deviceAPILevel = targetSDK.mid(targetSDK.indexOf(QLatin1Char('-')) + 1).toInt();
m_deviceSerialNumber = AndroidConfigurations::instance().getDeployDeviceSerialNumber(&m_deviceAPILevel, targetArch);
if (m_deviceSerialNumber.isEmpty())
m_deviceSerialNumber = AndroidConfigurations::instance().startAVD(&m_deviceAPILevel);
if (!m_deviceSerialNumber.length()) {
m_deviceSerialNumber.clear();
raiseError(tr("Cannot deploy: no devices or emulators found for your package."));
@@ -187,6 +189,8 @@ void AndroidDeployStep::cleanLibsOnDevice()
int deviceAPILevel = targetSDK.mid(targetSDK.indexOf(QLatin1Char('-')) + 1).toInt();
QString deviceSerialNumber = AndroidConfigurations::instance().getDeployDeviceSerialNumber(&deviceAPILevel, targetArch);
if (deviceSerialNumber.isEmpty())
deviceSerialNumber = AndroidConfigurations::instance().startAVD(&deviceAPILevel);
if (!deviceSerialNumber.length()) {
Core::MessageManager::instance()->printToOutputPane(tr("Could not run adb. No device found."), Core::MessageManager::NoModeSwitch);
return;
@@ -238,6 +242,8 @@ void AndroidDeployStep::installQASIPackage(const QString &packagePath)
const QString targetSDK = AndroidManager::targetSDK(target());
int deviceAPILevel = targetSDK.mid(targetSDK.indexOf(QLatin1Char('-')) + 1).toInt();
QString deviceSerialNumber = AndroidConfigurations::instance().getDeployDeviceSerialNumber(&deviceAPILevel, targetArch);
if (deviceSerialNumber.isEmpty())
deviceSerialNumber = AndroidConfigurations::instance().startAVD(&deviceAPILevel);
if (!deviceSerialNumber.length()) {
Core::MessageManager::instance()->printToOutputPane(tr("Could not run adb. No device found."), Core::MessageManager::NoModeSwitch);
return;