Fix NPE when cursor is null
Bug:19566774
Change-Id: I9269c81555ba46616628b7bd7997790502d760a3
diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
index f3db36c..b10963b 100644
--- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
@@ -32,6 +32,7 @@
import android.os.Bundle;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Contacts.Entity;
+import android.util.Log;
import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
@@ -48,6 +49,7 @@
public class ContactDeletionInteraction extends Fragment
implements LoaderCallbacks<Cursor>, OnDismissListener {
+ private static final String TAG = "ContactDeletionInteraction";
private static final String FRAGMENT_TAG = "deleteContact";
private static final String KEY_ACTIVE = "active";
@@ -224,6 +226,11 @@
return;
}
+ if (cursor == null || cursor.isClosed()) {
+ Log.e(TAG, "Failed to load contacts");
+ return;
+ }
+
long contactId = 0;
String lookupKey = null;