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

Android: Use new message manager API

Browse Source 
Bring pane to front if error occurs when trying to install custom APK.
This is only triggered when the user explicitly presses a button, so
that is fine.

Task-number: QTCREATORBUG-24430
Change-Id: I4358e9a430ac220400ed70ebfe617f556d6e91a3
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Eike Ziller
2020-12-01 14:54:29 +01:00
parent 3796b66423
commit b9a7864679
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -514,14 +514,15 @@ void AndroidManager::installQASIPackage(Target *target, const QString &packagePa
if (info.type == AndroidDeviceInfo::Emulator) { if (info.type == AndroidDeviceInfo::Emulator) {
deviceSerialNumber = AndroidAvdManager().startAvd(info.avdname); deviceSerialNumber = AndroidAvdManager().startAvd(info.avdname);
if (deviceSerialNumber.isEmpty()) if (deviceSerialNumber.isEmpty())
Core::MessageManager::write(tr("Starting Android virtual device failed.")); Core::MessageManager::writeDisrupting(tr("Starting Android virtual device failed."));
} }
QStringList arguments = AndroidDeviceInfo::adbSelector(deviceSerialNumber); QStringList arguments = AndroidDeviceInfo::adbSelector(deviceSerialNumber);
arguments << "install" << "-r " << packagePath; arguments << "install" << "-r " << packagePath;
QString error; QString error;
if (!runAdbCommandDetached(arguments, &error, true)) if (!runAdbCommandDetached(arguments, &error, true))
Core::MessageManager::write(tr("Android package installation failed.\n%1").arg(error)); Core::MessageManager::writeDisrupting(
tr("Android package installation failed.\n%1").arg(error));
} }
bool AndroidManager::checkKeystorePassword(const QString &keystorePath, const QString &keystorePasswd) bool AndroidManager::checkKeystorePassword(const QString &keystorePath, const QString &keystorePasswd)