From 3df4869a77bdeb72d5810bbcf7819ed1b8dd0ec7 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Tue, 19 May 2015 15:50:51 -0700
Subject: Fix Bitmap#sameAs NPE

Bug: 21281842

Change-Id: I4a1e33d7e642fa50e8789f1441e8587d1c15119c
---
 graphics/java/android/graphics/Bitmap.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'graphics')

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);
     }
 
     /**
-- 
cgit v1.1