summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-03-07 01:33:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 01:33:43 +0000
commit083f1b5d9ca50f1ca2decbec7f1ed5f35011b903 (patch)
tree1037a4ca6bc67618e3df05c91acc2d60fcca39c9
parent4ee527a461f5b936e0c4471f2470440fcec086b1 (diff)
parente9c89c814c97a74456ad1bf8d4c32a983663924c (diff)
downloadandroid_packages_apps_Gallery2-083f1b5d9ca50f1ca2decbec7f1ed5f35011b903.tar.gz
android_packages_apps_Gallery2-083f1b5d9ca50f1ca2decbec7f1ed5f35011b903.tar.bz2
android_packages_apps_Gallery2-083f1b5d9ca50f1ca2decbec7f1ed5f35011b903.zip
am e9c89c81: Merge "gallery: change typo \'&&\' to \'||\'"
* commit 'e9c89c814c97a74456ad1bf8d4c32a983663924c': gallery: change typo '&&' to '||'
-rw-r--r--src/com/android/gallery3d/app/AlbumSetDataLoader.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetDataLoader.java b/src/com/android/gallery3d/app/AlbumSetDataLoader.java
index cf380f812..909d9109c 100644
--- a/src/com/android/gallery3d/app/AlbumSetDataLoader.java
+++ b/src/com/android/gallery3d/app/AlbumSetDataLoader.java
@@ -115,7 +115,7 @@ public class AlbumSetDataLoader {
}
private void assertIsActive(int index) {
- if (index < mActiveStart && index >= mActiveEnd) {
+ if (index < mActiveStart || index >= mActiveEnd) {
throw new IllegalArgumentException(String.format(
"%s not in (%s, %s)", index, mActiveStart, mActiveEnd));
}