Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85faed16 authored by Stephen Bird's avatar Stephen Bird
Browse files

NPE: make sure that the brand icon isnt null 

Otherwise default back to a stock icon

Ticket: CD-630
Change-Id: I213513644aa6bb7259d8080ecf284dd6aeabf07e
(cherry picked from commit 87fa91e5)
parent 7be22e62

src/com/android/dialer/list/DialerPhoneNumberListAdapter.java

+8 −3
Original line number Diff line number Diff line
@@ -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;

                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");