diff options
| author | ztenghui <ztenghui@google.com> | 2013-06-26 21:26:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-26 21:26:56 +0000 |
| commit | 3be6f26ab847dfd336fb4de58a00d8dac081ebd1 (patch) | |
| tree | 171c769b88adbdce5dac1f21939e5d35bcac8c7a /src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java | |
| parent | 30e5b372e3f573d9ea339cc9c01657deae36a834 (diff) | |
| parent | d5b9386177313e7b0ffe9a137515a1d001fe87c6 (diff) | |
| download | android_packages_apps_Snap-3be6f26ab847dfd336fb4de58a00d8dac081ebd1.tar.gz android_packages_apps_Snap-3be6f26ab847dfd336fb4de58a00d8dac081ebd1.tar.bz2 android_packages_apps_Snap-3be6f26ab847dfd336fb4de58a00d8dac081ebd1.zip | |
Merge "Fix ambiguous naming and typo" into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java index 9d103d590..b192b5aaa 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java @@ -73,7 +73,7 @@ public class FilterRepresentation implements Cloneable { if (representation == null) { return false; } - if (representation.mFilterClass == representation.mFilterClass + if (representation.mFilterClass == mFilterClass && representation.mName.equalsIgnoreCase(mName) && representation.mPriority == mPriority && representation.mSupportsPartialRendering == mSupportsPartialRendering @@ -154,7 +154,7 @@ public class FilterRepresentation implements Cloneable { } } - public boolean allowsMultipleInstances() { + public boolean allowsSingleInstanceOnly() { return false; } |