Android: Reuse static instance of AndroidSdkManager

Use the instance from AndroidConfigurations inside
AndroidSettingsWidget.

This prevents recursive call to reloadPackages() in both
instances.

Minimize the chaos by reordering update items for m_androidSummary field
inside validateSdk(), to match the original order of creation.

Change-Id: I6253043c278e2e503e9114fbdc11ea17f9df4d8e
Reviewed-by: hjk <[email protected]>
Reviewed-by: Assam Boudjelthia <[email protected]>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index ebf28506c17..ad1f9f4937b 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -338,7 +338,6 @@ public:
     AndroidSdkPackageList filteredPackages(AndroidSdkPackage::PackageState state,
                                            AndroidSdkPackage::PackageType type)
     {
-        m_sdkManager.refreshPackages();
         return Utils::filtered(m_allPackages, [state, type](const AndroidSdkPackage *p) {
             return p->state() & state && p->type() & type;
         });
@@ -469,6 +468,8 @@ void AndroidSdkManager::refreshPackages()
 {
     if (AndroidConfig::sdkManagerToolPath() != m_d->lastSdkManagerPath)
         reloadPackages();
+    else
+        emit packageReloadFinished();
 }
 
 void AndroidSdkManager::reloadPackages()
@@ -512,7 +513,6 @@ AndroidSdkManagerPrivate::~AndroidSdkManagerPrivate()
 
 const AndroidSdkPackageList &AndroidSdkManagerPrivate::allPackages()
 {
-    m_sdkManager.refreshPackages();
     return m_allPackages;
 }