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

Commit 4f2c7f88 authored by Sergey Vasilinets's avatar Sergey Vasilinets Committed by android-build-merger
Browse files

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

am: 54b5a35c

Change-Id: I2cc440261656e5cbba5e0e24b7da22b7bc631106
parents 26991e6d 54b5a35c

graphics/java/android/graphics/Bitmap.java

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

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

        noteHardwareBitmapSlowCall();

        other.noteHardwareBitmapSlowCall();

        if (this == other) return true;

        if (other == null) return false;

        other.noteHardwareBitmapSlowCall();

        if (other.isRecycled()) {

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

        }