commit 4fa79b1fadb9acc9a69e3034b3c143933472d439
author Jay Shrauner <shrauner@google.com> Fri Nov 14 00:03:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 14 00:03:43 2014 +0000
tree 84fc28292f0da229cf43b172e55cd6ff30542170
parent 1cbbf23d5b141d6040fd7d090ed03adf30218806
parent 3b2c2024a6b93d1055bfbfb7bd8261f616365db8

am 3b2c2024: am 0bb76dc6: Merge "Fix NPE in background thread" into lmp-mr1-dev

* commit '3b2c2024a6b93d1055bfbfb7bd8261f616365db8':
  Fix NPE in background thread

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 48eb535..a03b514 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -1768,7 +1768,7 @@
             @Override
             protected MaterialPalette doInBackground(Void... params) {
 
-                if (imageViewDrawable instanceof BitmapDrawable
+                if (imageViewDrawable instanceof BitmapDrawable && mContactData != null
                         && mContactData.getThumbnailPhotoBinaryData() != null
                         && mContactData.getThumbnailPhotoBinaryData().length > 0) {
                     // Perform the color analysis on the thumbnail instead of the full sized