diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-03-04 01:43:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-04 01:43:23 +0000 |
| commit | 6a4db337c716d739c55b0c154eb16770a4b917e4 (patch) | |
| tree | 97aef6bb48535957c5c2d4d13e4e75667b238193 | |
| parent | 8a66abdfb9c09ba4cdd089921e9aa2934769e413 (diff) | |
| parent | 1e090bfaee34b45e1127dc1549bae1d60ca75b66 (diff) | |
| download | android_packages_apps_Contacts-6a4db337c716d739c55b0c154eb16770a4b917e4.tar.gz android_packages_apps_Contacts-6a4db337c716d739c55b0c154eb16770a4b917e4.tar.bz2 android_packages_apps_Contacts-6a4db337c716d739c55b0c154eb16770a4b917e4.zip | |
Merge "Fix NPE on non decodable Bitmap" into klp-dev
| -rw-r--r-- | src/com/android/contacts/activities/AttachPhotoActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/contacts/activities/AttachPhotoActivity.java b/src/com/android/contacts/activities/AttachPhotoActivity.java index c09af3c10..6a55c302e 100644 --- a/src/com/android/contacts/activities/AttachPhotoActivity.java +++ b/src/com/android/contacts/activities/AttachPhotoActivity.java @@ -223,6 +223,10 @@ public class AttachPhotoActivity extends ContactsActivity { 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); |