commit 65a2054a9b996a806588d4a03903c4ad34760023
author Yorke Lee <yorkelee@google.com> Wed Jun 24 00:40:23 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 00:40:23 2015 +0000
tree 6dc2e2495517f0918c059af07ba1f51f9e3f9d9c
parent 8de62dc556324189ddc23b6cb24193715197bee6
parent a53046920247c23b988916980a299afbdb2639f0

am a5304692: am d11524c7: am 65ea6334: Merge "Protect against CP2 crash in Dialer" into mnc-dev

* commit 'a53046920247c23b988916980a299afbdb2639f0':
  Protect against CP2 crash in Dialer

src/com/android/dialer/list/AllContactsFragment.java

diff --git a/src/com/android/dialer/list/AllContactsFragment.java b/src/com/android/dialer/list/AllContactsFragment.java
index 71c6980..d34250b 100644
--- a/src/com/android/dialer/list/AllContactsFragment.java
+++ b/src/com/android/dialer/list/AllContactsFragment.java
@@ -75,7 +75,7 @@
     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);
         }
     }