Merge "Catch CP2 exception in DefaultVoicemailNotifier" into mnc-dev
diff --git a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
index d0553b4..a6d165e 100644
--- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
+++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
@@ -302,6 +302,9 @@
newCalls[cursor.getPosition()] = createNewCallsFromCursor(cursor);
}
return newCalls;
+ } catch (RuntimeException e) {
+ Log.w(TAG, "Exception when querying Contacts Provider for calls lookup");
+ return null;
} finally {
MoreCloseables.closeQuietly(cursor);
}
@@ -371,6 +374,9 @@
PROJECTION, null, null, null);
if (cursor == null || !cursor.moveToFirst()) return null;
return cursor.getString(DISPLAY_NAME_COLUMN_INDEX);
+ } catch (RuntimeException e) {
+ Log.w(TAG, "Exception when querying Contacts Provider for name lookup");
+ return null;
} finally {
if (cursor != null) {
cursor.close();