Fix a concurrent issue in reload().

We need to hold the DataManager.LOCK when calling reload.

Change-Id: If908c233bcd835effffc7750a7ef07f56a63136c
fix: 6315479

diff --git a/src/com/android/gallery3d/data/LocalAlbumSet.java b/src/com/android/gallery3d/data/LocalAlbumSet.java
index 56c84f3..47e3bd4 100644 (file)
--- a/src/com/android/gallery3d/data/LocalAlbumSet.java
+++ b/src/com/android/gallery3d/data/LocalAlbumSet.java
@@ -207,7 +207,6 @@ public class LocalAlbumSet extends MediaSet
             for (BucketEntry entry : entries) {
                 MediaSet album = getLocalAlbum(dataManager,
                         mType, mPath, entry.bucketId, entry.bucketName);
-                album.reload();
                 albums.add(album);
             }
             return albums;
@@ -270,6 +269,9 @@ public class LocalAlbumSet extends MediaSet
         if (mLoadBuffer != null) {
             mAlbums = mLoadBuffer;
             mLoadBuffer = null;
+            for (MediaSet album : mAlbums) {
+                album.reload();
+            }
             mDataVersion = nextVersionNumber();
         }
         return mDataVersion;

diff --git a/src/com/android/gallery3d/data/MtpDeviceSet.java b/src/com/android/gallery3d/data/MtpDeviceSet.java
index dd79bc1..46cc0fc 100644 (file)
--- a/src/com/android/gallery3d/data/MtpDeviceSet.java
+++ b/src/com/android/gallery3d/data/MtpDeviceSet.java
@@ -76,10 +76,6 @@ public class MtpDeviceSet extends MediaSet
                 }
             }
             Collections.sort(result, MediaSetUtils.NAME_COMPARATOR);
-
-            for (int i = 0, n = result.size(); i < n; ++i) {
-                result.get(i).reload();
-            }
             return result;
         }
     }
@@ -122,6 +118,9 @@ public class MtpDeviceSet extends MediaSet
         if (mLoadBuffer != null) {
             mDeviceSet = mLoadBuffer;
             mLoadBuffer = null;
+            for (MediaSet device : mDeviceSet) {
+                device.reload();
+            }
             mDataVersion = nextVersionNumber();
         }
         return mDataVersion;