SDK Man2: Clear local source caches when reloading.

Change-Id: I984ae397ada014ff8869d5775be1bc779ef22319

2 files changed, 19 insertions, 0 deletions

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSources.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSources.java
index d4622ad..0b57eb1 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSources.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSources.java
@@ -157,6 +157,22 @@ public class SdkSources {
     }

 

     /**

+     * Each source keeps a local cache of whatever it loaded recently.

+     * This calls {@link SdkSource#clearPackages()} on all the available sources,

+     * and the next call to {@link SdkSource#getPackages()} will actually reload

+     * the remote package list.

+     */

+    public void clearAllPackages() {

+        synchronized(mSources) {

+            for (ArrayList<SdkSource> list : mSources.values()) {

+                for (SdkSource source : list) {

+                    source.clearPackages();

+                }

+            }

+        }

+    }

+

+    /**

      * Returns the category of a given source, or null if the source is unknown.

      * <p/>

      * Note that this method uses object identity to find a given source, and does

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/PackagesPage.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/PackagesPage.java
index 9b0788d..0d6dd7a 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/PackagesPage.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/PackagesPage.java
@@ -382,6 +382,9 @@ public class PackagesPage extends UpdaterPage
 
                 switch (action) {
                 case RELOAD:
+                    // Clear all source caches, otherwise loading will use the cached data
+                    mDiffLogic.mUpdaterData.getLocalSdkParser().clearPackages();
+                    mDiffLogic.mUpdaterData.getSources().clearAllPackages();
                     loadPackages();
                     break;
                 case SHOW_ADDON_SITES: