Merge "Fix editor crash in multi-window mode" into ub-contactsdialer-g-dev
diff --git a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
index d1dc8b4..020d581 100644
--- a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
@@ -24,6 +24,7 @@
import android.net.Uri;
import android.provider.CallLog.Calls;
import android.text.TextUtils;
+import android.util.Log;
import com.google.common.annotations.VisibleForTesting;
@@ -37,6 +38,8 @@
public class CallLogInteractionsLoader extends AsyncTaskLoader<List<ContactInteraction>> {
+ private static final String TAG = "CallLogInteractions";
+
private final String[] mPhoneNumbers;
private final String[] mSipNumbers;
private final int mMaxToRetrieve;
@@ -129,8 +132,13 @@
// as we don't also set the {@link android.provider.CallLog.Calls.LIMIT_PARAM_KEY} that
// becomes available in KK.
final String orderByAndLimit = Calls.DATE + " DESC LIMIT " + mMaxToRetrieve;
- final Cursor cursor = getContext().getContentResolver().query(uri, null, null, null,
- orderByAndLimit);
+ Cursor cursor = null;
+ try {
+ cursor = getContext().getContentResolver().query(uri, null, null, null,
+ orderByAndLimit);
+ } catch (Exception e) {
+ Log.e(TAG, "Can not query calllog", e);
+ }
try {
if (cursor == null || cursor.getCount() < 1) {
return Collections.emptyList();