diff options
author | Alessandro Portale <alessandro.portale@qt.io> | 2020-09-12 11:05:53 +0200 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@qt.io> | 2020-09-15 08:56:55 +0000 |
commit | a159af342edd52ad7cd9cd34503990e50e8c7b37 (patch) | |
tree | 799581405f611e756066cdd15234c58baea61ad3 /src/plugins/android/androidmanager.cpp | |
parent | eff72258be28b7c7747892588183ca3e0e1554ef (diff) | |
download | qt-creator-a159af342edd52ad7cd9cd34503990e50e8c7b37.tar.gz |
Android: Remove unused functions
As found by Cppcheck
Change-Id: I9274fe45ed49099b52b4f8556508ec0adc676386
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/plugins/android/androidmanager.cpp')
-rw-r--r-- | src/plugins/android/androidmanager.cpp | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index fbf298c84b..fd681a5db8 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -77,7 +77,6 @@ using namespace Android::Internal; namespace Android { const QLatin1String AndroidManifestName("AndroidManifest.xml"); -const QLatin1String AndroidDefaultPropertiesName("project.properties"); const QLatin1String AndroidDeviceSn("AndroidDeviceSerialNumber"); const QLatin1String AndroidDeviceAbis("AndroidDeviceAbis"); const QLatin1String ApiLevelKey("AndroidVersion.ApiLevel"); @@ -89,17 +88,6 @@ const QString qtcSignature("This file is generated by QtCreator to be read by an static Q_LOGGING_CATEGORY(androidManagerLog, "qtc.android.androidManager", QtWarningMsg) -static QString parseAaptOutput(const QString &output, const QString ®Ex) -{ - const QRegularExpression regRx(regEx, - QRegularExpression::CaseInsensitiveOption | - QRegularExpression::MultilineOption); - QRegularExpressionMatch match = regRx.match(output); - if (match.hasMatch()) - return match.captured("target"); - return QString(); -} - class Library { public: @@ -139,69 +127,6 @@ QString AndroidManager::packageName(const FilePath &manifestFile) return manifestElem.attribute(QLatin1String("package")); } -bool AndroidManager::packageInstalled(const QString &deviceSerial, - const QString &packageName) -{ - if (deviceSerial.isEmpty() || packageName.isEmpty()) - return false; - QStringList args = AndroidDeviceInfo::adbSelector(deviceSerial); - args << "shell" << "pm" << "list" << "packages"; - QStringList lines = runAdbCommand(args).stdOut().split(QRegularExpression("[\\n\\r]"), - Qt::SkipEmptyParts); - for (const QString &line : lines) { - // Don't want to confuse com.abc.xyz with com.abc.xyz.def so check with - // endsWith - if (line.endsWith(packageName)) - return true; - } - return false; -} - -int AndroidManager::packageVersionCode(const QString &deviceSerial, - const QString &packageName) -{ - if (deviceSerial.isEmpty() || packageName.isEmpty()) - return -1; - - QStringList args = AndroidDeviceInfo::adbSelector(deviceSerial); - args << "shell" << "dumpsys" << "package" << packageName; - const QRegularExpression regRx(versionCodeRegEx, - QRegularExpression::CaseInsensitiveOption | - QRegularExpression::MultilineOption); - QRegularExpressionMatch match = regRx.match(runAdbCommand(args).stdOut()); - if (match.hasMatch()) - return match.captured("version").toInt(); - - return -1; -} - -void AndroidManager::apkInfo(const FilePath &apkPath, - QString *packageName, - int *version, - QString *activityPath) -{ - SdkToolResult result; - result = runAaptCommand({"dump", "badging", apkPath.toString()}); - - QString packageStr; - if (activityPath) { - packageStr = parseAaptOutput(result.stdOut(), packageNameRegEx); - QString path = parseAaptOutput(result.stdOut(), activityRegEx); - if (!packageStr.isEmpty() && !path.isEmpty()) - *activityPath = packageStr + '/' + path; - } - - if (packageName) { - *packageName = activityPath ? packageStr : - parseAaptOutput(result.stdOut(), packageNameRegEx); - } - - if (version) { - QString versionStr = parseAaptOutput(result.stdOut(), apkVersionRegEx); - *version = versionStr.toInt(); - } -} - QString AndroidManager::activityName(const Target *target) { QDomDocument doc; @@ -422,11 +347,6 @@ void AndroidManager::setManifestPath(Target *target, const FilePath &path) target->setNamedSettings(AndroidManifestName, QVariant::fromValue(path)); } -FilePath AndroidManager::defaultPropertiesPath(const Target *target) -{ - return dirPath(target).pathAppended(AndroidDefaultPropertiesName); -} - QString AndroidManager::deviceSerialNumber(const Target *target) { return target->namedSettings(AndroidDeviceSn).toString(); @@ -767,20 +687,6 @@ bool AndroidManager::updateGradleProperties(Target *target, const QString &build return mergeGradleProperties(gradlePropertiesPath, gradleProperties); } -int AndroidManager::findApiLevel(const FilePath &platformPath) -{ - int apiLevel = -1; - const FilePath propertiesPath = platformPath / "/source.properties"; - if (propertiesPath.exists()) { - QSettings sdkProperties(propertiesPath.toString(), QSettings::IniFormat); - bool validInt = false; - apiLevel = sdkProperties.value(ApiLevelKey).toInt(&validInt); - if (!validInt) - apiLevel = -1; - } - return apiLevel; -} - QProcess *AndroidManager::runAdbCommandDetached(const QStringList &args, QString *err, bool deleteOnFinish) { @@ -830,10 +736,4 @@ SdkToolResult AndroidManager::runAdbCommand(const QStringList &args, return runCommand({AndroidConfigurations::currentConfig().adbToolPath(), args}, writeData, timeoutS); } - -SdkToolResult AndroidManager::runAaptCommand(const QStringList &args, int timeoutS) -{ - return runCommand({AndroidConfigurations::currentConfig().aaptToolPath(), args}, {}, - timeoutS); -} } // namespace Android |