From 9771333f9f53e9208e18285ee966b17cfdea7c7d Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 30 Jan 2018 18:31:40 +0100 Subject: Android: Tolerate foreign run configurations The only things specific to AndroidRunConfiguration are amStartExtraArgs() and postFinishShellCommands(). Those are considered to be empty on foreign configurations. Change-Id: Ia0b8381c30225942e8704db04d17a8bdd3d2c806 Reviewed-by: Vikas Pachdha --- src/plugins/android/androidrunner.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/plugins/android/androidrunner.cpp') diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index b2952b578e..5004e70a41 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -694,13 +694,15 @@ AndroidRunner::AndroidRunner(RunControl *runControl) m_androidRunnable.intentName.indexOf(QLatin1Char('/'))); m_androidRunnable.deviceSerialNumber = AndroidManager::deviceSerialNumber(m_target); - auto androidRunConfig = qobject_cast(runControl->runConfiguration()); - m_androidRunnable.amStartExtraArgs = androidRunConfig->amStartExtraArgs(); - for (QString shellCmd: androidRunConfig->preStartShellCommands()) - m_androidRunnable.beforeStartAdbCommands.append(QString("shell %1").arg(shellCmd)); - - for (QString shellCmd: androidRunConfig->postFinishShellCommands()) - m_androidRunnable.afterFinishAdbCommands.append(QString("shell %1").arg(shellCmd)); + if (auto androidRunConfig = qobject_cast( + runControl->runConfiguration())) { + m_androidRunnable.amStartExtraArgs = androidRunConfig->amStartExtraArgs(); + for (QString shellCmd: androidRunConfig->preStartShellCommands()) + m_androidRunnable.beforeStartAdbCommands.append(QString("shell %1").arg(shellCmd)); + + for (QString shellCmd: androidRunConfig->postFinishShellCommands()) + m_androidRunnable.afterFinishAdbCommands.append(QString("shell %1").arg(shellCmd)); + } m_worker.reset(new AndroidRunnerWorker(runControl, m_androidRunnable)); m_worker->moveToThread(&m_thread); -- cgit v1.2.1