commit 8d56a13bc205ffbe260fa7ed7e90d6a753294054
author Jay Shrauner <shrauner@google.com> Tue Mar 04 01:46:57 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 04 01:46:57 2014 +0000
tree 94b123871a71f682ade241f12c17d8f2964b8b29
parent 067dc16dfd1ed3fdb60aa9d867f0104330b2bb9a
parent 6a4db337c716d739c55b0c154eb16770a4b917e4

am 6a4db337: Merge "Fix NPE on non decodable Bitmap" into klp-dev

* commit '6a4db337c716d739c55b0c154eb16770a4b917e4':
  Fix NPE on non decodable Bitmap

src/com/android/contacts/activities/AttachPhotoActivity.java

diff --git a/src/com/android/contacts/activities/AttachPhotoActivity.java b/src/com/android/contacts/activities/AttachPhotoActivity.java
index c09af3c..6a55c30 100644
--- a/src/com/android/contacts/activities/AttachPhotoActivity.java
+++ b/src/com/android/contacts/activities/AttachPhotoActivity.java
@@ -223,6 +223,10 @@
             Log.w(TAG, "Could not find bitmap");
             return;
         }
+        if (bitmap == null) {
+            Log.w(TAG, "Could not decode bitmap");
+            return;
+        }
 
         final Bitmap scaled = Bitmap.createScaledBitmap(bitmap, size, size, false);
         final byte[] compressed = ContactPhotoUtils.compressBitmap(scaled);