summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-02-01 01:34:39 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-02-01 01:34:40 +0000
commite9c89c814c97a74456ad1bf8d4c32a983663924c (patch)
tree7a0c830d54322337d9f4bc9f2654f3605d7e7514
parent044648be152a8914d68c4952dae2694dd43460da (diff)
parentfe99791c6a04221f8163a09104a1ba5c78046f17 (diff)
downloadandroid_packages_apps_Gallery2-e9c89c814c97a74456ad1bf8d4c32a983663924c.tar.gz
android_packages_apps_Gallery2-e9c89c814c97a74456ad1bf8d4c32a983663924c.tar.bz2
android_packages_apps_Gallery2-e9c89c814c97a74456ad1bf8d4c32a983663924c.zip
Merge "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));
}