Android: Use latest setup pattern for AndroidDeviceManager

More uniform.

Change-Id: I93f6190f3fe4ad89f635e2968ae6e9ae1343610f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

src/plugins/android/androiddevice.cpp

@@ -30,6 +30,7 @@
 #include <utils/port.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
+#include <utils/shutdownguard.h>
 #include <utils/url.h>
 
 #include <QFileSystemWatcher>
@@ -89,7 +90,7 @@ static SdkToolResult runAdbCommand(const QStringList &args)
 class AndroidDeviceManagerInstance : public QObject
 {
 public:
-    AndroidDeviceManagerInstance(QObject *parent);
+    AndroidDeviceManagerInstance();
     ~AndroidDeviceManagerInstance()
     {
         QTC_ASSERT(s_instance == this, return);
@@ -99,7 +100,7 @@ public:
     void setupDevicesWatcher();
     void eraseAvd(const IDevice::Ptr &device, QWidget *parent);
 
-    Group m_avdListRecipe;
+    Group m_avdListRecipe{};
     TaskTreeRunner m_avdListRunner;
     TaskTreeRunner m_avdDeviceWatcherRunner;
     std::unique_ptr<Process> m_removeAvdProcess;
@@ -842,9 +843,7 @@ static void handleAvdListChange(const AndroidDeviceInfoList &avdList)
     }
 }
 
-AndroidDeviceManagerInstance::AndroidDeviceManagerInstance(QObject *parent)
-    : QObject(parent)
-    , m_avdListRecipe{}
+AndroidDeviceManagerInstance::AndroidDeviceManagerInstance()
 {
     QTC_ASSERT(!s_instance, return);
     s_instance = this;
@@ -1092,9 +1091,9 @@ void setupAndroidDevice()
     static AndroidDeviceFactory theAndroidDeviceFactory;
 }
 
-void setupAndroidDeviceManager(QObject *guard)
+void setupAndroidDeviceManager()
 {
-    (void) new AndroidDeviceManagerInstance(guard);
+    static GuardedObject<AndroidDeviceManagerInstance> theAndroidDeviceManager;
 }
 
 } // Android::Internal

src/plugins/android/androiddevice.h

@@ -74,6 +74,6 @@ Tasking::Group createAvdRecipe(const Tasking::Storage<std::optional<QString>> &e
                                const CreateAvdInfo &info, bool force);
 
 void setupAndroidDevice();
-void setupAndroidDeviceManager(QObject *guard);
+void setupAndroidDeviceManager();
 
 } // Android::Internal

src/plugins/android/androidplugin.cpp

@@ -84,7 +84,7 @@ class AndroidPlugin final : public ExtensionSystem::IPlugin
         setupAndroidQtVersion();
         setupAndroidToolchain();
 
-        setupAndroidDeviceManager(this);
+        setupAndroidDeviceManager();
 
         setupAndroidSettingsPage();