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

Commit 3df4869a authored by John Reck's avatar John Reck
Browse files

Fix Bitmap#sameAs NPE

Bug: 21281842

Change-Id: I4a1e33d7e642fa50e8789f1441e8587d1c15119c
parent 95ba62f8
Loading
Loading
Loading
Loading
+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);
    }

    /**