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

Commit 5121e8c1 authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

am ceddfcbf: am b1f6aebb: Merge "Fix Bitmap#sameAs NPE" into mnc-dev 

* commit 'ceddfcbf':
  Fix Bitmap#sameAs NPE
parents 6e53d7ef ceddfcbf

graphics/java/android/graphics/Bitmap.java

+3 −2
Original line number Diff line number Diff line
@@ -1575,11 +1575,12 @@ public final class Bitmap implements Parcelable { 
     */

    public boolean sameAs(Bitmap other) {

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

        if (this == other) return true;

        if (other == null) return false;

        if (other.isRecycled()) {

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

        }

        return this == other || (other != null

                && nativeSameAs(mFinalizer.mNativeBitmap, other.mFinalizer.mNativeBitmap));

        return nativeSameAs(mFinalizer.mNativeBitmap, other.mFinalizer.mNativeBitmap);

    }



    /**