Revert "Android: Make the device watcher process terminate on shutdown"

This reverts commit e45e16d904f704920bd457fdf3302f3ae7061459.

Reason for revert: This one should look different in master

Change-Id: I4fbf3a9d046e5fe5a6a45d5ba93b685f5967498c
Reviewed-by: Eike Ziller <[email protected]>

1 files changed, 10 insertions, 26 deletions

diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index d0b782df442..8609fc7a89f 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -35,8 +35,6 @@
 
 #include <coreplugin/icore.h>
 
-#include <extensionsystem/iplugin.h>
-
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/devicesupport/idevicewidget.h>
 #include <projectexplorer/kitinformation.h>
@@ -590,8 +588,6 @@ void AndroidDeviceManager::setupDevicesWatcher()
     m_adbDeviceWatcherProcess->setCommand(command);
     m_adbDeviceWatcherProcess->setEnvironment(AndroidConfigurations::toolsEnvironment(m_androidConfig));
     m_adbDeviceWatcherProcess->start();
-    qCDebug(androidDeviceLog).noquote() << "ADB device watcher started:"
-                                        << command.toUserOutput();
 
     // Setup AVD filesystem watcher to listen for changes when an avd is created/deleted,
     // or started/stopped
@@ -615,28 +611,6 @@ void AndroidDeviceManager::setupDevicesWatcher()
     updateAvdsList();
 }
 
-void AndroidDeviceManager::shutdownDevicesWatcher()
-{
-    m_avdsFutureWatcher.waitForFinished();
-    m_removeAvdFutureWatcher.waitForFinished();
-
-    if (m_adbDeviceWatcherProcess) {
-        m_adbDeviceWatcherProcess->terminate();
-        m_adbDeviceWatcherProcess->waitForFinished();
-        m_adbDeviceWatcherProcess.reset();
-
-        // Despite terminate/waitForFinished, the process may still
-        // be around and remain if Qt Creator finishes too early.
-        QTimer::singleShot(1000, this, [this] { emit devicesWatcherShutdownFinished(); });
-    }
-}
-
-ExtensionSystem::IPlugin::ShutdownFlag AndroidDeviceManager::devicesShutdownFlag() const
-{
-    return m_adbDeviceWatcherProcess ? ExtensionSystem::IPlugin::AsynchronousShutdown
-                                     : ExtensionSystem::IPlugin::SynchronousShutdown;
-}
-
 void AndroidDeviceManager::HandleAvdsListChange()
 {
     DeviceManager *const devMgr = DeviceManager::instance();
@@ -790,6 +764,16 @@ AndroidDeviceManager::AndroidDeviceManager(QObject *parent)
       m_androidConfig(AndroidConfigurations::currentConfig()),
       m_avdManager(m_androidConfig)
 {
+    connect(qApp, &QCoreApplication::aboutToQuit, this, [this]() {
+        if (m_adbDeviceWatcherProcess) {
+            m_adbDeviceWatcherProcess->terminate();
+            m_adbDeviceWatcherProcess->waitForFinished();
+            m_adbDeviceWatcherProcess.reset();
+        }
+        m_avdsFutureWatcher.waitForFinished();
+        m_removeAvdFutureWatcher.waitForFinished();
+    });
+
     connect(&m_removeAvdFutureWatcher, &QFutureWatcherBase::finished,
             this, &AndroidDeviceManager::handleAvdRemoved);
 }