diff options
author | Yorke Lee <yorkelee@google.com> | 2015-06-24 00:31:58 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-24 00:31:58 +0000 |
commit | a53046920247c23b988916980a299afbdb2639f0 (patch) | |
tree | 517d24b541fddb4db02920d97e98d8f0bb7bd5bd /src | |
parent | ebb0cd42a4ef5c396b73e6702a68bed952b58c2c (diff) | |
parent | d11524c726aaed4f30f3084a14bfafc627a355a9 (diff) |
am d11524c7: am 65ea6334: Merge "Protect against CP2 crash in Dialer" into mnc-dev
* commit 'd11524c726aaed4f30f3084a14bfafc627a355a9':
Protect against CP2 crash in Dialer
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/list/AllContactsFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/dialer/list/AllContactsFragment.java b/src/com/android/dialer/list/AllContactsFragment.java index 71c6980f3..d34250b48 100644 --- a/src/com/android/dialer/list/AllContactsFragment.java +++ b/src/com/android/dialer/list/AllContactsFragment.java @@ -75,7 +75,7 @@ public class AllContactsFragment extends ContactEntryListFragment<ContactEntryLi public void onLoadFinished(Loader<Cursor> loader, Cursor data) { super.onLoadFinished(loader, data); - if (data.getCount() == 0) { + if (data == null || data.getCount() == 0) { mEmptyListView.setVisibility(View.VISIBLE); } } |