diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-06-24 00:08:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-24 00:08:48 +0000 |
| commit | 65ea6334c0a9ad6324f2b81849ec09f9e97d6934 (patch) | |
| tree | fbf73a8963e4e9e3a7363fb450c35fa09a22bac9 /src | |
| parent | 5e06d94af135fe5a5b971601a7e6d4a8f420e4d0 (diff) | |
| parent | e35b0efae9406cd5fa5c80b487e4a4846d6e485d (diff) | |
Merge "Protect against CP2 crash in Dialer" into mnc-dev
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); } } |