From b5499f0360f4be35b32f3060e86cddeb101326d9 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 4 Dec 2019 12:52:46 +0100 Subject: [PATCH] Android: Don't attempt to handle a non-existing qt_live_viewer.apk This remove 4 failed adb calls if the qt_live_viewer.apk is missing (which it always is). Task-number: QTCREATORBUG-23313 Change-Id: I8dbf833b35a9386d8d87f72c043dd019c62b4467 Reviewed-by: Vikas Pachdha --- src/plugins/android/androiddevice.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index 9b9e4d9c133..7bf6e1195bb 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -56,12 +56,14 @@ AndroidDevice::AndroidDevice() setOsType(Utils::OsTypeOtherUnix); setDeviceState(DeviceReadyToUse); - QString activityPath; const AndroidConfig &config = AndroidConfigurations::currentConfig(); - AndroidManager::apkInfo(config.qtLiveApkPath(), nullptr, nullptr, &activityPath); - qCDebug(androidDeviceLog) << "Using Qt live apk from: " << config.qtLiveApkPath() - << "Activity Path:" << activityPath; - setQmlsceneCommand(activityPath); + if (config.qtLiveApkPath().exists()) { + QString activityPath; + AndroidManager::apkInfo(config.qtLiveApkPath(), nullptr, nullptr, &activityPath); + qCDebug(androidDeviceLog) << "Using Qt live apk from: " << config.qtLiveApkPath() + << "Activity Path:" << activityPath; + setQmlsceneCommand(activityPath); + } } IDevice::DeviceInfo AndroidDevice::deviceInformation() const