Android: Restore original calls to refreshPackages

And remove the additional emission of packagesReloaded() signal.

The refreshPackages() may or may not emit the packagesReloaded() signal
synchronously. To make sure we validateSdk() on initial show just once,
we call refreshPackages() and validateSdk() in a row and after that
we establish connection to the packagesReloaded() signal.

It fixes qml project build.

Amends 56b88ab7580d0db10adb36e5972e83e13ea3f2c2
Amends ca8e5dbb4ee1f9f66d9dd0a2d24472a46d6bda5d

Change-Id: If472950cdc05e1bdc080ef1781967b5dacec4433
Reviewed-by: hjk <[email protected]>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index 2eab707d697..e5f2be4a7d1 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -341,6 +341,7 @@ 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;
         });
@@ -477,8 +478,6 @@ void AndroidSdkManager::refreshPackages()
 {
     if (AndroidConfig::sdkManagerToolPath() != m_d->lastSdkManagerPath)
         reloadPackages();
-    else
-        emit packagesReloaded();
 }
 
 void AndroidSdkManager::reloadPackages()
@@ -522,6 +521,7 @@ AndroidSdkManagerPrivate::~AndroidSdkManagerPrivate()
 
 const AndroidSdkPackageList &AndroidSdkManagerPrivate::allPackages()
 {
+    m_sdkManager.refreshPackages();
     return m_allPackages;
 }