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

Android: Hide getDeviceProperty() in cpp

Browse Source 
Use a new CommandLine's c'tor.

Change-Id: I7e0809e97ae265cc83bd05a335beb4fa815e2a4e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-05-21 10:57:30 +02:00
parent 5edbbbcb67
commit c6174e8f1c
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,6 +168,18 @@ static QString getAvdName(const QString &serialnumber)
return {};
}
static QString getDeviceProperty(const QString &device, const QString &property)
{
// workaround for '????????????' serial numbers
Process adbProc;
adbProc.setCommand({androidConfig().adbToolPath(),
{AndroidDeviceInfo::adbSelector(device), "shell", "getprop", property}});
adbProc.runBlocking();
if (adbProc.result() == ProcessResult::FinishedWithSuccess)
return adbProc.allOutput();
return {};
}
//////////////////////////////////
// AndroidConfig
//////////////////////////////////
@@ -699,25 +711,10 @@ bool AndroidConfig::isConnected(const QString &serialNumber) const
return false;
}
QString AndroidConfig::getDeviceProperty(const QString &device, const QString &property)
{
// workaround for '????????????' serial numbers
Process adbProc;
adbProc.setCommand({androidConfig().adbToolPath(),
{AndroidDeviceInfo::adbSelector(device), "shell", "getprop", property}});
adbProc.runBlocking();
if (adbProc.result() != ProcessResult::FinishedWithSuccess)
return {};
return adbProc.allOutput();
}
int AndroidConfig::getSDKVersion(const QString &device)
{
QString tmp = getDeviceProperty(device, "ro.build.version.sdk");
if (tmp.isEmpty())
return -1;
return tmp.trimmed().toInt();
const QString tmp = getDeviceProperty(device, "ro.build.version.sdk");
return tmp.isEmpty() ? -1 : tmp.trimmed().toInt();
}
//!
@@ -730,7 +727,7 @@ QString AndroidConfig::getProductModel(const QString &device) const
if (m_serialNumberToDeviceName.contains(device))
return m_serialNumberToDeviceName.value(device);
QString model = getDeviceProperty(device, "ro.product.model").trimmed();
const QString model = getDeviceProperty(device, "ro.product.model").trimmed();
if (model.isEmpty())
return device;

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

@@ -142,8 +142,6 @@ public:
Utils::Environment toolsEnvironment() const;
private:
static QString getDeviceProperty(const QString &device, const QString &property);
Utils::FilePath openJDKBinPath() const;
void parseDependenciesJson();