summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-06-24 00:40:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-24 00:40:23 +0000
commit65a2054a9b996a806588d4a03903c4ad34760023 (patch)
tree6dc2e2495517f0918c059af07ba1f51f9e3f9d9c
parent8de62dc556324189ddc23b6cb24193715197bee6 (diff)
parenta53046920247c23b988916980a299afbdb2639f0 (diff)
am a5304692: am d11524c7: am 65ea6334: Merge "Protect against CP2 crash in Dialer" into mnc-dev
* commit 'a53046920247c23b988916980a299afbdb2639f0': Protect against CP2 crash in Dialer
-rw-r--r--src/com/android/dialer/list/AllContactsFragment.java2
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);
}
}