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

Commit 69c8dd36 authored by nicolasroard's avatar nicolasroard Committed by Android Git Automerger
Browse files

am 0d9b166b: am 466f3d9b: am 0a624bb8: Fix potential crash (regression... 

am 0d9b166b: am 466f3d9b: am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402)

* commit '0d9b166b':
  Fix potential crash (regression introduced with fix for 7406402)
parents c29939b6 0d9b166b

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

+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ public class ImageFilterBorder extends ImageFilter { 
        if (!isBorderFilter) {

            return false;

        }

        if (!(filter instanceof ImageFilterBorder)) {

            return false;

        }

        ImageFilterBorder borderFilter = (ImageFilterBorder) filter;

        if (mNinePatch != borderFilter.mNinePatch) {

            return false;

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

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ public class ImageFilterParametricBorder extends ImageFilter { 
        if (!isBorderFilter) {

            return false;

        }

        if (!(filter instanceof ImageFilterParametricBorder)) {

            return false;

        }

        ImageFilterParametricBorder borderFilter = (ImageFilterParametricBorder) filter;

        if (borderFilter.mBorderColor != mBorderColor) {

            return false;