Gallery2: update content start/end once getUpdateinfo

When delete last picture in album , the album has changed,
but this time current index and content start/end is still
old value.

To aviod this situation, will update content start and content end
once after getUpdateinfo and then can get correct current index and
item path.

CRs-Fixed: 624471

Change-Id: I8eb92e685f321df2d11481f440f7d9d33cf7b820

1 files changed, 6 insertions, 2 deletions

diff --git a/src/com/android/gallery3d/app/PhotoDataAdapter.java b/src/com/android/gallery3d/app/PhotoDataAdapter.java
index 1e47ab0b7..20702b646 100755
--- a/src/com/android/gallery3d/app/PhotoDataAdapter.java
+++ b/src/com/android/gallery3d/app/PhotoDataAdapter.java
@@ -1043,6 +1043,10 @@ public class PhotoDataAdapter implements PhotoPage.Model {
                 if (info.version != version) {
                     info.reloadContent = true;
                     info.size = mSource.getMediaItemCount();
+                    int start = Utils.clamp(info.indexHint - DATA_CACHE_SIZE / 2,
+                            0, Math.max(0, info.size - DATA_CACHE_SIZE));
+                    info.contentStart = start;
+                    info.contentEnd = Math.min(info.size, start + DATA_CACHE_SIZE);
                 }
                 if (!info.reloadContent) continue;
                 info.items = mSource.getMediaItem(
@@ -1086,8 +1090,8 @@ public class PhotoDataAdapter implements PhotoPage.Model {
                 }
 
                 // Don't change index if mSize == 0
-                if (mSize > 0) {
-                    if (index >= mSize) index = mSize - 1;
+                if (info.size > 0) {
+                    if (index >= info.size) index = info.size - 1;
                 }
 
                 info.indexHint = index;