NPE: make sure that the brand icon isnt null

Otherwise default back to a stock icon

Change-Id: I213513644aa6bb7259d8080ecf284dd6aeabf07e

1 files changed, 8 insertions, 3 deletions

diff --git a/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java b/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java
index 6d2784e3b..15a9a658e 100644
--- a/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java
+++ b/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java
@@ -215,7 +215,7 @@ public class DialerPhoneNumberListAdapter extends PhoneNumberListAdapter {
 
     private void assignShortcutToView(ContactListItemView v, int shortcutType, int position) {
         final CharSequence text;
-        final int drawableId;
+        int drawableId;
         final Drawable drawableRaw;
         final Resources resources = getContext().getResources();
         final String number = getFormattedQueryString();
@@ -226,7 +226,7 @@ public class DialerPhoneNumberListAdapter extends PhoneNumberListAdapter {
                         mBidiFormatter.unicodeWrap(number, TextDirectionHeuristics.LTR));
 
                 CallMethodInfo ccm = getCurrentCallMethod();
-                if (ccm != null && ccm.mIsInCallProvider) {
+                if (ccm != null && ccm.mIsInCallProvider && ccm.mBrandIcon != null) {
                     drawableId = 0;
                     drawableRaw = ImageUtils.scaleDrawable(ccm.mBrandIcon, 0.5f);
                 } else {
@@ -269,7 +269,12 @@ public class DialerPhoneNumberListAdapter extends PhoneNumberListAdapter {
                     text = resources.getString(R.string.sign_in_hint_text, cmi.mName);
                 }
                 drawableId = 0;
-                drawableRaw = ImageUtils.scaleDrawable(cmi.mBrandIcon, 0.5f);
+                if (cmi.mBrandIcon != null) {
+                    drawableRaw = ImageUtils.scaleDrawable(cmi.mBrandIcon, 0.5f);
+                } else {
+                    drawableId = R.drawable.ic_search_phone;
+                    drawableRaw = null;
+                }
                 break;
             default:
                 throw new IllegalArgumentException("Invalid shortcut type");