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

Commit 1ae0cf68 authored by Yorke Lee's avatar Yorke Lee
Browse files

Fix possible NPE in DialerDatabaseHelper 

In certain cases (third party contact backup solutions?) it is possible
for raw contacts to end up with null display names, which the Dialer
was crashing on. This fix performs a null check and inserts the default
(No name) contact name if we find that the display name is null.

Bug: 11750613
Change-Id: Ifbaf2861534e6eaf8a86d50d584d11a9fa38b65f
parent b372f3e5

src/com/android/dialer/database/DialerDatabaseHelper.java

+8 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.text.TextUtils; 
import android.util.Log;



import com.android.contacts.common.util.StopWatch;

import com.android.dialer.R;

import com.android.dialer.dialpad.SmartDialNameMatcher;

import com.android.dialer.dialpad.SmartDialPrefix;
@@ -631,7 +632,13 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper { 
                insert.bindString(2, updatedContactCursor.getString(PhoneQuery.PHONE_NUMBER));

                insert.bindLong(3, updatedContactCursor.getLong(PhoneQuery.PHONE_CONTACT_ID));

                insert.bindString(4, updatedContactCursor.getString(PhoneQuery.PHONE_LOOKUP_KEY));

                insert.bindString(5, updatedContactCursor.getString(PhoneQuery.PHONE_DISPLAY_NAME));

                final String displayName = updatedContactCursor.getString(

                        PhoneQuery.PHONE_DISPLAY_NAME);

                if (displayName == null) {

                    insert.bindString(5, mContext.getResources().getString(R.string.missing_name));

                } else {

                    insert.bindString(5, displayName);

                }

                insert.bindLong(6, updatedContactCursor.getLong(PhoneQuery.PHONE_PHOTO_ID));

                insert.bindLong(7, updatedContactCursor.getLong(PhoneQuery.PHONE_LAST_TIME_USED));

                insert.bindLong(8, updatedContactCursor.getInt(PhoneQuery.PHONE_TIMES_USED));