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

Android: Remove AndroidRunnable::intentName

Browse Source 
It was only uses to pass the intent from the Runner to the RunnerWorker,
use a normal stand-alone QString member and setter instead.

Change-Id: I0fde87b0177d4ed013f9599600929070362ea09c
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
hjk
2018-05-15 09:52:09 +02:00
parent 2d13e94f5b
commit 0031dbb667
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,6 @@ struct ANDROID_EXPORT AndroidRunnable
{ {
AndroidRunnable(); AndroidRunnable();
QString packageName; QString packageName;
QString intentName;
QStringList amStartExtraArgs; QStringList amStartExtraArgs;
QStringList beforeStartAdbCommands; QStringList beforeStartAdbCommands;
QStringList afterFinishAdbCommands; QStringList afterFinishAdbCommands;
@@ -46,7 +45,6 @@ struct ANDROID_EXPORT AndroidRunnable
inline bool operator==(const AndroidRunnable &r1, const AndroidRunnable &r2) inline bool operator==(const AndroidRunnable &r1, const AndroidRunnable &r2)
{ {
return r1.packageName == r2.packageName return r1.packageName == r2.packageName
&& r1.intentName == r2.intentName
&& r1.amStartExtraArgs == r2.amStartExtraArgs && r1.amStartExtraArgs == r2.amStartExtraArgs
&& r1.beforeStartAdbCommands == r2.beforeStartAdbCommands && r1.beforeStartAdbCommands == r2.beforeStartAdbCommands
&& r1.afterFinishAdbCommands == r2.afterFinishAdbCommands; && r1.afterFinishAdbCommands == r2.afterFinishAdbCommands;

7
src/plugins/android/androidrunner.cpp
View File

@@ -127,10 +127,8 @@ AndroidRunner::AndroidRunner(RunControl *runControl,
m_checkAVDTimer.setInterval(2000); m_checkAVDTimer.setInterval(2000);
connect(&m_checkAVDTimer, &QTimer::timeout, this, &AndroidRunner::checkAVD); connect(&m_checkAVDTimer, &QTimer::timeout, this, &AndroidRunner::checkAVD);
m_androidRunnable.intentName = intentName.isEmpty() ? AndroidManager::intentName(m_target) QString intent = intentName.isEmpty() ? AndroidManager::intentName(m_target) : intentName;
: intentName; m_androidRunnable.packageName = intent.left(intent.indexOf('/'));
m_androidRunnable.packageName = m_androidRunnable.intentName.left(
m_androidRunnable.intentName.indexOf(QLatin1Char('/')));
RunConfiguration *rc = runControl->runConfiguration(); RunConfiguration *rc = runControl->runConfiguration();
if (auto aspect = rc->extraAspect(Constants::ANDROID_AMSTARTARGS_ASPECT)) if (auto aspect = rc->extraAspect(Constants::ANDROID_AMSTARTARGS_ASPECT))
@@ -148,6 +146,7 @@ AndroidRunner::AndroidRunner(RunControl *runControl,
const int apiLevel = AndroidManager::deviceApiLevel(m_target); const int apiLevel = AndroidManager::deviceApiLevel(m_target);
m_worker.reset(new AndroidRunnerWorker(runControl, m_androidRunnable)); m_worker.reset(new AndroidRunnerWorker(runControl, m_androidRunnable));
m_worker->setIntentName(intent);
m_worker->setIsPreNougat(apiLevel <= 23); m_worker->setIsPreNougat(apiLevel <= 23);
m_worker->setExtraAppParams(extraAppParams); m_worker->setExtraAppParams(extraAppParams);
m_worker->setExtraEnvVars(extraEnvVars); m_worker->setExtraEnvVars(extraEnvVars);

2
src/plugins/android/androidrunnerworker.cpp
View File

@@ -345,7 +345,7 @@ void AndroidRunnerWorker::asyncStartHelper()
QStringList args({"shell", "am", "start"}); QStringList args({"shell", "am", "start"});
args << m_androidRunnable.amStartExtraArgs; args << m_androidRunnable.amStartExtraArgs;
args << "-n" << m_androidRunnable.intentName; args << "-n" << m_intentName;
if (m_useCppDebugger) { if (m_useCppDebugger) {
args << "-D"; args << "-D";
QString gdbServerSocket; QString gdbServerSocket;

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

@@ -62,6 +62,7 @@ public:
void setExtraEnvVars(const Utils::Environment &extraEnvVars); void setExtraEnvVars(const Utils::Environment &extraEnvVars);
void setExtraAppParams(const QString &extraAppParams); void setExtraAppParams(const QString &extraAppParams);
void setIsPreNougat(bool isPreNougat) { m_isPreNougat = isPreNougat; } void setIsPreNougat(bool isPreNougat) { m_isPreNougat = isPreNougat; }
void setIntentName(const QString &intentName) { m_intentName = intentName; }
void asyncStart(); void asyncStart();
void asyncStop(); void asyncStop();
@@ -89,6 +90,7 @@ protected:
// Create the processes and timer in the worker thread, for correct thread affinity // Create the processes and timer in the worker thread, for correct thread affinity
bool m_isPreNougat = false; bool m_isPreNougat = false;
AndroidRunnable m_androidRunnable; AndroidRunnable m_androidRunnable;
QString m_intentName;
QString m_adb; QString m_adb;
qint64 m_processPID = -1; qint64 m_processPID = -1;
std::unique_ptr<QProcess, Deleter> m_adbLogcatProcess; std::unique_ptr<QProcess, Deleter> m_adbLogcatProcess;