diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/Bitmap.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index a999b71..8ad7c12 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -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); } /** |