summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2018-03-02 16:48:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-02 16:48:46 +0000
commit118f67bb288ba37d5e383b677c8352330a34a2d4 (patch)
treeae0b9659b85539e73b8c608f85f46a1e7efa434b
parentc111fb81eb6759e6b745aa9888638878407b9076 (diff)
parentc61338150e1349617dcc4861515d91e87027fb0d (diff)
downloadandroid_packages_apps_Gallery2-118f67bb288ba37d5e383b677c8352330a34a2d4.tar.gz
android_packages_apps_Gallery2-118f67bb288ba37d5e383b677c8352330a34a2d4.tar.bz2
android_packages_apps_Gallery2-118f67bb288ba37d5e383b677c8352330a34a2d4.zip
Merge "Gallery2: Fix CollectionIncompatibleType" am: 7115c7cbf9 am: ae4d8c9a73
am: c61338150e Change-Id: I48ff76febe268de8af1b2ccfc8f582e9685f6209
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
index a3a7e9555..928c3eae9 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
@@ -104,7 +104,7 @@ public class FilterGradRepresentation extends FilterRepresentation
count++;
}
}
- return "c=" + mBands.indexOf(mBands) + "[" + mBands.size() + "]" + count;
+ return "c=" + mBands.indexOf(mCurrentBand) + "[" + mBands.size() + "]" + count;
}
private void creatExample() {