Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sergey Vasilinets
2017-05-10 20:28:21 +00:00
committed by Android (Google) Code Review
parent 9bda9ead49 e1fc36d197
commit 8d2b02bf08
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/java/android/graphics/Bitmap.java
View File

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