commit a53046920247c23b988916980a299afbdb2639f0
author Yorke Lee <yorkelee@google.com> Wed Jun 24 00:31:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 00:31:58 2015 +0000
tree 517d24b541fddb4db02920d97e98d8f0bb7bd5bd
parent ebb0cd42a4ef5c396b73e6702a68bed952b58c2c
parent d11524c726aaed4f30f3084a14bfafc627a355a9

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

* commit 'd11524c726aaed4f30f3084a14bfafc627a355a9':
  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);
         }
     }