Fix npe due to strict mode in Bitmap.sameAs

bug:38164234
Test: none
Change-Id: Ib267d1b06f86980202693fc1c330f73ed06411b0
This commit is contained in:
sergeyv
2017-05-09 16:36:09 -07:00
parent bbc764e83a
commit e1fc36d197

View File

@@ -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!");
}