diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-09-24 10:26:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-24 10:26:02 -0700 |
| commit | d4be2b4a44d167dac8e5748bfc5e76d466726b4b (patch) | |
| tree | a20dafccdb5bd552539f782aa70e6e0d754ddb22 | |
| parent | 54558dc30a9f9660c94af201b599e5b219ac268e (diff) | |
| parent | 93d5734c67f1acb746e730aeba624473aa18c6a0 (diff) | |
| download | android_packages_apps_Gallery2-d4be2b4a44d167dac8e5748bfc5e76d466726b4b.tar.gz android_packages_apps_Gallery2-d4be2b4a44d167dac8e5748bfc5e76d466726b4b.tar.bz2 android_packages_apps_Gallery2-d4be2b4a44d167dac8e5748bfc5e76d466726b4b.zip | |
am 93d5734c: am 508a14fe: am d04aaf62: Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad
* commit '93d5734c67f1acb746e730aeba624473aa18c6a0':
Fix crash in caching pipeline
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java index fc83e4f8c..0fb157d7b 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java @@ -271,7 +271,8 @@ public class FilterRepresentation { } public boolean canMergeWith(FilterRepresentation representation) { - if (representation.getFilterType() == FilterRepresentation.TYPE_GEOMETRY) { + if (getFilterType() == FilterRepresentation.TYPE_GEOMETRY + && representation.getFilterType() == FilterRepresentation.TYPE_GEOMETRY) { return true; } return false; |