diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 3b23eac445c..3027495dfc1 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -205,11 +205,6 @@ void AndroidManager::apkInfo(const Utils::FilePath &apkPath, } } -QString AndroidManager::intentName(ProjectExplorer::Target *target) -{ - return packageName(target) + QLatin1Char('/') + activityName(target); -} - QString AndroidManager::activityName(ProjectExplorer::Target *target) { QDomDocument doc; diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h index e141636c176..eed226d440f 100644 --- a/src/plugins/android/androidmanager.h +++ b/src/plugins/android/androidmanager.h @@ -78,7 +78,6 @@ public: QString *packageName = nullptr, int *version = nullptr, QString *activityPath = nullptr); - static QString intentName(ProjectExplorer::Target *target); static QString activityName(ProjectExplorer::Target *target); static QString deviceSerialNumber(ProjectExplorer::Target *target); diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index 62328589b56..06871b93ae6 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -132,7 +132,10 @@ AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName) m_checkAVDTimer.setInterval(2000); connect(&m_checkAVDTimer, &QTimer::timeout, this, &AndroidRunner::checkAVD); - QString intent = intentName.isEmpty() ? AndroidManager::intentName(m_target) : intentName; + QString intent = intentName; + if (intent.isEmpty()) + intent = AndroidManager::packageName(m_target) + '/' + AndroidManager::activityName(m_target); + m_packageName = intent.left(intent.indexOf('/')); qCDebug(androidRunnerLog) << "Intent name:" << intent << "Package name" << m_packageName;