summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-11-28 10:44:20 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-28 10:44:20 -0800
commit0048915b4cea0196daa17dc69f7e10e9be9a4387 (patch)
treed813d7fba4edf5465b37a243fed7f2ec3afac885 /src/com/android/gallery3d/app
parent48ac0347df314fe845a425d7a8645ce04b8a979d (diff)
parent63360570aecd7dbdc7bf2a4d06a264c7eee66bb7 (diff)
downloadandroid_packages_apps_Snap-0048915b4cea0196daa17dc69f7e10e9be9a4387.tar.gz
android_packages_apps_Snap-0048915b4cea0196daa17dc69f7e10e9be9a4387.tar.bz2
android_packages_apps_Snap-0048915b4cea0196daa17dc69f7e10e9be9a4387.zip
Merge "AlbumDataLoader.get returns correct value if not in cache" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d/app')
-rw-r--r--src/com/android/gallery3d/app/AlbumDataLoader.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/AlbumDataLoader.java b/src/com/android/gallery3d/app/AlbumDataLoader.java
index 0ee1b03af..28a822830 100644
--- a/src/com/android/gallery3d/app/AlbumDataLoader.java
+++ b/src/com/android/gallery3d/app/AlbumDataLoader.java
@@ -120,8 +120,7 @@ public class AlbumDataLoader {
public MediaItem get(int index) {
if (!isActive(index)) {
- throw new IllegalArgumentException(String.format(
- "%s not in (%s, %s)", index, mActiveStart, mActiveEnd));
+ return mSource.getMediaItem(index, 1).get(0);
}
return mData[index % mData.length];
}