diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-11 22:24:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-11 22:24:46 +0000 |
| commit | b21b9f9b2efbc358ee9806af87b7edc3f82af4da (patch) | |
| tree | 3e6418fc85a41ccfb06b362f39f462485061e80d /java/com/android/dialer/contactsfragment | |
| parent | 3523770fcf79ccf3b05ca2485af08b78f53b1294 (diff) | |
| parent | bf900241b71a4a594ce989bf0d18ada1d5fadb56 (diff) | |
Merge changes I8578dd2c,Ia8e581f1
* changes:
Send PhoneAccountHandle with ACTION_CONFIGURE_VOICEMAIL
Fix NPE in contacts fragment.
Diffstat (limited to 'java/com/android/dialer/contactsfragment')
| -rw-r--r-- | java/com/android/dialer/contactsfragment/ContactsFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/com/android/dialer/contactsfragment/ContactsFragment.java b/java/com/android/dialer/contactsfragment/ContactsFragment.java index ddf00b358..7d2097692 100644 --- a/java/com/android/dialer/contactsfragment/ContactsFragment.java +++ b/java/com/android/dialer/contactsfragment/ContactsFragment.java @@ -179,7 +179,7 @@ public class ContactsFragment extends Fragment @Override public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) { - if (cursor.getCount() == 0) { + if (cursor == null || cursor.getCount() == 0) { emptyContentView.setDescription(R.string.all_contacts_empty); emptyContentView.setActionLabel(R.string.all_contacts_empty_add_contact_action); emptyContentView.setVisibility(View.VISIBLE); |