Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 508a14fe authored by nicolasroard's avatar nicolasroard Committed by Android Git Automerger
Browse files

am d04aaf62: Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad 

* commit 'd04aaf62':
  Fix crash in caching pipeline
parents b920df87 d04aaf62

src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java

+2 −1
Original line number Diff line number Diff line
@@ -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;