Android: put "am start" extra args at the end of the arguments list

Add "am start" extra arguments after all the params used by Creator's
deployment process are added. This in turn help tackle two issues:
1) Allowing users to use [-n] to start a different Activity than the
default one.
2) Won't fail deployment silently is a param is a non supported arg,
where adb would try to start an app but the return code is 0 even if
the that app is not found.

Then, we don't need the warning aspect anymore because after this
change, we would rely on "adb am start" to report an exception, but
the app would start anyway if the case 2 above occurs.

Change-Id: Ie609b748e76a068c66c8a9be1d08ccc050167ad1
Reviewed-by: hjk <hjk@qt.io>

2 files changed, 2 insertions, 9 deletions

diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp
index e1477c2615..b0b3c58f99 100644
--- a/src/plugins/android/androidrunconfiguration.cpp
+++ b/src/plugins/android/androidrunconfiguration.cpp
@@ -90,17 +90,10 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Utils::Id id)
     auto amStartArgsAspect = addAspect<StringAspect>();
     amStartArgsAspect->setId(Constants::ANDROID_AM_START_ARGS);
     amStartArgsAspect->setSettingsKey("Android.AmStartArgsKey");
-    amStartArgsAspect->setLabelText(tr("Activity manager start options:"));
+    amStartArgsAspect->setLabelText(tr("Activity manager start arguments:"));
     amStartArgsAspect->setDisplayStyle(StringAspect::LineEditDisplay);
     amStartArgsAspect->setHistoryCompleter("Android.AmStartArgs.History");
 
-    auto warning = addAspect<StringAspect>();
-    warning->setDisplayStyle(StringAspect::LabelDisplay);
-    warning->setLabelPixmap(Icons::WARNING.pixmap());
-    warning->setValue(tr("If the \"am start\" options conflict, the application might not start.\n"
-                         "%1 uses: am start -n <package_name>/<Activity_name> [-D].")
-                          .arg(Core::Constants::IDE_DISPLAY_NAME));
-
     auto preStartShellCmdAspect = addAspect<BaseStringListAspect>();
     preStartShellCmdAspect->setDisplayStyle(StringAspect::TextEditDisplay);
     preStartShellCmdAspect->setId(Constants::ANDROID_PRESTARTSHELLCMDLIST);
diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index 83c512a46a..759eba59e4 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -552,7 +552,6 @@ void AndroidRunnerWorker::asyncStartHelper()
         runAdb(entry.split(' ', Qt::SkipEmptyParts));
 
     QStringList args({"shell", "am", "start"});
-    args << m_amStartExtraArgs;
     args << "-n" << m_intentName;
     if (m_useCppDebugger) {
         args << "-D";
@@ -636,6 +635,7 @@ void AndroidRunnerWorker::asyncStartHelper()
         }
     }
 
+    args << m_amStartExtraArgs;
 
     if (!m_extraAppParams.isEmpty()) {
         QStringList appArgs =