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

Commit b2ad95ed authored by Brandon Maxwell's avatar Brandon Maxwell Committed by Android (Google) Code Review
Browse files

Merge "Fixing NullPointer in NumbersAdapter" into ub-contactsdialer-b-dev

parents 34ce8f1b 45cbce1e

src/com/android/dialer/calllog/ContactInfoHelper.java

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.provider.ContactsContract.CommonDataKinds.Phone; 
import android.provider.ContactsContract.Contacts;

import android.provider.ContactsContract.DisplayNameSources;

import android.provider.ContactsContract.PhoneLookup;

import android.support.annotation.Nullable;

import android.telephony.PhoneNumberUtils;

import android.text.TextUtils;

import android.util.Log;
@@ -72,6 +73,7 @@ public class ContactInfoHelper { 
     * @param number the number to look up

     * @param countryIso the country associated with this number

     */

    @Nullable

    public ContactInfo lookupNumber(String number, String countryIso) {

        if (TextUtils.isEmpty(number)) {

            return null;

src/com/android/dialer/filterednumber/NumbersAdapter.java

+8 −6
Original line number Diff line number Diff line
@@ -15,10 +15,8 @@ 
 */

package com.android.dialer.filterednumber;



import android.app.Activity;

import android.app.FragmentManager;

import android.content.Context;

import android.content.res.Resources;

import android.provider.ContactsContract;

import android.provider.ContactsContract.CommonDataKinds.Phone;

import android.text.BidiFormatter;
@@ -43,7 +41,6 @@ public class NumbersAdapter extends SimpleCursorAdapter { 
    private Context mContext;

    private FragmentManager mFragmentManager;

    private ContactInfoHelper mContactInfoHelper;

    private Resources mResources;

    private BidiFormatter mBidiFormatter = BidiFormatter.getInstance();

    private ContactPhotoManager mContactPhotoManager;
@@ -68,11 +65,16 @@ public class NumbersAdapter extends SimpleCursorAdapter { 
        if (CompatUtils.hasPrioritizedMimeType()) {

            quickContactBadge.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE);

        }

        final ContactInfo info = mContactInfoHelper.lookupNumber(number, countryIso);



        ContactInfo info = mContactInfoHelper.lookupNumber(number, countryIso);

        if (info == null) {

            info = new ContactInfo();

            info.number = number;

        }

        final CharSequence locationOrType = getNumberTypeOrLocation(info);

        final String displayNumber = getDisplayNumber(info);

        final String displayNumberStr = mBidiFormatter.unicodeWrap(

                displayNumber.toString(), TextDirectionHeuristics.LTR);

        final String displayNumberStr = mBidiFormatter.unicodeWrap(displayNumber,

                TextDirectionHeuristics.LTR);



        String nameForDefaultImage;

        if (!TextUtils.isEmpty(info.name)) {