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

Commit 8d2b02bf authored by Sergey Vasilinets's avatar Sergey Vasilinets Committed by Android (Google) Code Review
Browse files

Merge "Fix npe due to strict mode in Bitmap.sameAs" into oc-dev

parents 9bda9ead e1fc36d1

graphics/java/android/graphics/Bitmap.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1869,9 +1869,9 @@ public final class Bitmap implements Parcelable { 
    public boolean sameAs(Bitmap other) {

    public boolean sameAs(Bitmap other) {

        checkRecycled("Can't call sameAs on a recycled bitmap!");

        checkRecycled("Can't call sameAs on a recycled bitmap!");

        noteHardwareBitmapSlowCall();

        noteHardwareBitmapSlowCall();

        other.noteHardwareBitmapSlowCall();

        if (this == other) return true;

        if (this == other) return true;

        if (other == null) return false;

        if (other == null) return false;

        other.noteHardwareBitmapSlowCall();

        if (other.isRecycled()) {

        if (other.isRecycled()) {

            throw new IllegalArgumentException("Can't compare to a recycled bitmap!");

            throw new IllegalArgumentException("Can't compare to a recycled bitmap!");

        }

        }