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

Android: rename avdname to avdName in AndroidDeviceInfo

Browse Source 
Change-Id: I9f4743b0d9f953f1fa407acfea41345571cb9998
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2021-10-13 21:18:13 +03:00
parent e5ce9e9e76
commit 851171f772
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -322,7 +322,7 @@ QString AndroidAvdManager::findAvd(const QString &avdName) const
foreach (AndroidDeviceInfo device, devices) { foreach (AndroidDeviceInfo device, devices) {
if (device.type != ProjectExplorer::IDevice::Emulator) if (device.type != ProjectExplorer::IDevice::Emulator)
continue; continue;
if (device.avdname == avdName) if (device.avdName == avdName)
return device.serialNumber; return device.serialNumber;
} }
return QString(); return QString();

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

@@ -669,9 +669,9 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
dev.state = IDevice::DeviceReadyToUse; dev.state = IDevice::DeviceReadyToUse;
if (dev.type == IDevice::Emulator) { if (dev.type == IDevice::Emulator) {
dev.avdname = getAvdName(dev.serialNumber); dev.avdName = getAvdName(dev.serialNumber);
if (dev.avdname.isEmpty()) if (dev.avdName.isEmpty())
dev.avdname = serialNo; dev.avdName = serialNo;
} }
devices.push_back(dev); devices.push_back(dev);

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

@@ -208,7 +208,7 @@ bool AndroidDeployQtStep::init()
.arg(info.cpuAbi.first()))); .arg(info.cpuAbi.first())));
} }
m_avdName = info.avdname; m_avdName = info.avdName;
m_serialNumber = info.serialNumber; m_serialNumber = info.serialNumber;
qCDebug(deployStepLog) << "Selected device info:" << info; qCDebug(deployStepLog) << "Selected device info:" << info;

10
src/plugins/android/androiddevice.cpp
View File

@@ -231,7 +231,7 @@ AndroidDeviceInfo AndroidDevice::androidDeviceInfoFromIDevice(const IDevice *dev
{ {
AndroidDeviceInfo info; AndroidDeviceInfo info;
info.state = dev->deviceState(); info.state = dev->deviceState();
info.avdname = dev->extraData(Constants::AndroidAvdName).toString(); info.avdName = dev->extraData(Constants::AndroidAvdName).toString();
info.serialNumber = dev->extraData(Constants::AndroidSerialNumber).toString(); info.serialNumber = dev->extraData(Constants::AndroidSerialNumber).toString();
info.cpuAbi = dev->extraData(Constants::AndroidCpuAbi).toStringList(); info.cpuAbi = dev->extraData(Constants::AndroidCpuAbi).toStringList();
const QString avdPath = dev->extraData(Constants::AndroidAvdPath).toString(); const QString avdPath = dev->extraData(Constants::AndroidAvdPath).toString();
@@ -246,12 +246,12 @@ QString AndroidDevice::displayNameFromInfo(const AndroidDeviceInfo &info)
{ {
return info.type == IDevice::Hardware return info.type == IDevice::Hardware
? AndroidConfigurations::currentConfig().getProductModel(info.serialNumber) ? AndroidConfigurations::currentConfig().getProductModel(info.serialNumber)
: info.avdname; : info.avdName;
} }
Id AndroidDevice::idFromDeviceInfo(const AndroidDeviceInfo &info) Id AndroidDevice::idFromDeviceInfo(const AndroidDeviceInfo &info)
{ {
const QString id = (info.type == IDevice::Hardware ? info.serialNumber : info.avdname); const QString id = (info.type == IDevice::Hardware ? info.serialNumber : info.avdName);
return Id(Constants::ANDROID_DEVICE_ID).withSuffix(':' + id); return Id(Constants::ANDROID_DEVICE_ID).withSuffix(':' + id);
} }
@@ -640,7 +640,7 @@ void AndroidDeviceManager::HandleAvdsListChange()
devMgr->removeDevice(dev->id()); devMgr->removeDevice(dev->id());
} else { } else {
// Find the state of the AVD retrieved from the AVD watcher // Find the state of the AVD retrieved from the AVD watcher
const QString serial = getRunningAvdsSerialNumber(item.avdname); const QString serial = getRunningAvdsSerialNumber(item.avdName);
const IDevice::DeviceState state = getDeviceState(serial, IDevice::Emulator); const IDevice::DeviceState state = getDeviceState(serial, IDevice::Emulator);
if (dev->deviceState() != state) { if (dev->deviceState() != state) {
devMgr->setDeviceState(dev->id(), state); devMgr->setDeviceState(dev->id(), state);
@@ -658,7 +658,7 @@ void AndroidDeviceManager::HandleAvdsListChange()
newDev->setMachineType(item.type); newDev->setMachineType(item.type);
newDev->setDeviceState(item.state); newDev->setDeviceState(item.state);
newDev->setExtraData(Constants::AndroidAvdName, item.avdname); newDev->setExtraData(Constants::AndroidAvdName, item.avdName);
newDev->setExtraData(Constants::AndroidSerialNumber, item.serialNumber); newDev->setExtraData(Constants::AndroidSerialNumber, item.serialNumber);
newDev->setExtraData(Constants::AndroidCpuAbi, item.cpuAbi); newDev->setExtraData(Constants::AndroidCpuAbi, item.cpuAbi);
newDev->setExtraData(Constants::AndroidSdk, item.sdk); newDev->setExtraData(Constants::AndroidSdk, item.sdk);

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

@@ -46,15 +46,15 @@ bool AndroidDeviceInfo::operator<(const AndroidDeviceInfo &other) const
return type == ProjectExplorer::IDevice::Hardware; return type == ProjectExplorer::IDevice::Hardware;
if (sdk != other.sdk) if (sdk != other.sdk)
return sdk < other.sdk; return sdk < other.sdk;
if (avdname != other.avdname) if (avdName != other.avdName)
return avdname < other.avdname; return avdName < other.avdName;
return serialNumber < other.serialNumber; return serialNumber < other.serialNumber;
} }
bool AndroidDeviceInfo::operator==(const AndroidDeviceInfo &other) const bool AndroidDeviceInfo::operator==(const AndroidDeviceInfo &other) const
{ {
return serialNumber == other.serialNumber && avdname == other.avdname return serialNumber == other.serialNumber && avdName == other.avdName
&& avdPath == other.avdPath && cpuAbi == other.cpuAbi && avdPath == other.avdPath && cpuAbi == other.cpuAbi
&& sdk == other.sdk && state == other.state && type == other.type; && sdk == other.sdk && state == other.state && type == other.type;
} }
@@ -63,7 +63,7 @@ QDebug &operator<<(QDebug &stream, const AndroidDeviceInfo &device)
{ {
stream << "Type:" << (device.type == ProjectExplorer::IDevice::Emulator ? "Emulator" : "Device") stream << "Type:" << (device.type == ProjectExplorer::IDevice::Emulator ? "Emulator" : "Device")
<< ", ABI:" << device.cpuAbi << ", Serial:" << device.serialNumber << ", ABI:" << device.cpuAbi << ", Serial:" << device.serialNumber
<< ", Name:" << device.avdname << ", API:" << device.sdk << ", Name:" << device.avdName << ", API:" << device.sdk
<< ", Authorised:" << (device.state == IDevice::DeviceReadyToUse); << ", Authorised:" << (device.state == IDevice::DeviceReadyToUse);
return stream; return stream;
} }

4
src/plugins/android/androiddeviceinfo.h
View File

@@ -40,7 +40,7 @@ class AndroidDeviceInfo
{ {
public: public:
QString serialNumber; QString serialNumber;
QString avdname; QString avdName;
QStringList cpuAbi; QStringList cpuAbi;
int sdk = -1; int sdk = -1;
IDevice::DeviceState state = IDevice::DeviceDisconnected; IDevice::DeviceState state = IDevice::DeviceDisconnected;
@@ -49,7 +49,7 @@ public:
static QStringList adbSelector(const QString &serialNumber); static QStringList adbSelector(const QString &serialNumber);
bool isValid() const { return !serialNumber.isEmpty() || !avdname.isEmpty(); } bool isValid() const { return !serialNumber.isEmpty() || !avdName.isEmpty(); }
bool operator<(const AndroidDeviceInfo &other) const; bool operator<(const AndroidDeviceInfo &other) const;
bool operator==(const AndroidDeviceInfo &other) const; // should be = default with C++20 bool operator==(const AndroidDeviceInfo &other) const; // should be = default with C++20
bool operator!=(const AndroidDeviceInfo &other) const { return !(*this == other); } bool operator!=(const AndroidDeviceInfo &other) const { return !(*this == other); }

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

@@ -573,7 +573,7 @@ void AndroidManager::installQASIPackage(Target *target, const FilePath &packageP
QString deviceSerialNumber = info.serialNumber; QString deviceSerialNumber = info.serialNumber;
if (info.type == IDevice::Emulator) { if (info.type == IDevice::Emulator) {
deviceSerialNumber = AndroidAvdManager().startAvd(info.avdname); deviceSerialNumber = AndroidAvdManager().startAvd(info.avdName);
if (deviceSerialNumber.isEmpty()) if (deviceSerialNumber.isEmpty())
Core::MessageManager::writeDisrupting(tr("Starting Android virtual device failed.")); Core::MessageManager::writeDisrupting(tr("Starting Android virtual device failed."));
} }

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

@@ -250,7 +250,7 @@ bool AndroidQmlPreviewWorker::ensureAvdIsRunning()
if (devInfoLocal.isValid()) { if (devInfoLocal.isValid()) {
if (dev->machineType() == IDevice::Emulator) { if (dev->machineType() == IDevice::Emulator) {
appendMessage(tr("Launching AVD."), NormalMessageFormat); appendMessage(tr("Launching AVD."), NormalMessageFormat);
devInfoLocal.serialNumber = avdMananager.startAvd(devInfoLocal.avdname); devInfoLocal.serialNumber = avdMananager.startAvd(devInfoLocal.avdName);
} }
if (devInfoLocal.serialNumber.isEmpty()) { if (devInfoLocal.serialNumber.isEmpty()) {
appendMessage(tr("Could not start AVD."), ErrorMessageFormat); appendMessage(tr("Could not start AVD."), ErrorMessageFormat);

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

@@ -193,9 +193,9 @@ void AndroidRunner::launchAVD()
emit androidDeviceInfoChanged(info); emit androidDeviceInfoChanged(info);
if (info.isValid()) { if (info.isValid()) {
AndroidAvdManager avdManager; AndroidAvdManager avdManager;
if (!info.avdname.isEmpty() && avdManager.findAvd(info.avdname).isEmpty()) { if (!info.avdName.isEmpty() && avdManager.findAvd(info.avdName).isEmpty()) {
bool launched = avdManager.startAvdAsync(info.avdname); bool launched = avdManager.startAvdAsync(info.avdName);
m_launchedAVDName = launched ? info.avdname:""; m_launchedAVDName = launched ? info.avdName:"";
} else { } else {
m_launchedAVDName.clear(); m_launchedAVDName.clear();
} }

4
src/plugins/android/avdmanageroutputparser.cpp
View File

@@ -74,7 +74,7 @@ static Utils::optional<AndroidDeviceInfo> parseAvd(const QStringList &deviceInfo
qCDebug(avdOutputParserLog) << "Avd Parsing: Skip avd device. Error key found:" << line; qCDebug(avdOutputParserLog) << "Avd Parsing: Skip avd device. Error key found:" << line;
return {}; return {};
} else if (valueForKey(avdInfoNameKey, line, &value)) { } else if (valueForKey(avdInfoNameKey, line, &value)) {
avd.avdname = value; avd.avdName = value;
} else if (valueForKey(avdInfoPathKey, line, &value)) { } else if (valueForKey(avdInfoPathKey, line, &value)) {
const Utils::FilePath avdPath = Utils::FilePath::fromUserInput(value); const Utils::FilePath avdPath = Utils::FilePath::fromUserInput(value);
avd.avdPath = avdPath; avd.avdPath = avdPath;
@@ -89,7 +89,7 @@ static Utils::optional<AndroidDeviceInfo> parseAvd(const QStringList &deviceInfo
qCDebug(avdOutputParserLog) << "Avd Parsing: Cannot find ABI:" << configFile; qCDebug(avdOutputParserLog) << "Avd Parsing: Cannot find ABI:" << configFile;
// Get Target // Get Target
const QString avdInfoFileName = avd.avdname + ".ini"; const QString avdInfoFileName = avd.avdName + ".ini";
const Utils::FilePath avdInfoFile = avdPath.parentDir().pathAppended( const Utils::FilePath avdInfoFile = avdPath.parentDir().pathAppended(
avdInfoFileName); avdInfoFileName);
QSettings avdInfo(avdInfoFile.toString(), QSettings::IniFormat); QSettings avdInfo(avdInfoFile.toString(), QSettings::IniFormat);