diff options
author | Yorke Lee <yorkelee@google.com> | 2015-07-16 23:19:14 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-16 23:19:14 +0000 |
commit | 7293a99b7c8299c8e0fa0566322fe39093ccc760 (patch) | |
tree | 1c328dcf6304240590b595ef575b19bbaf47d407 | |
parent | 13cc3c124a9a66effb5177cf02d6c16086d9b133 (diff) | |
parent | aab92012f78bac0f63d29cdef10a24c79f1d75fc (diff) |
am aab92012: Merge "Catch CP2 exception in DefaultVoicemailNotifier" into mnc-dev
* commit 'aab92012f78bac0f63d29cdef10a24c79f1d75fc':
Catch CP2 exception in DefaultVoicemailNotifier
-rw-r--r-- | src/com/android/dialer/calllog/DefaultVoicemailNotifier.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java index d0553b4ac..a6d165e3a 100644 --- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java +++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java @@ -302,6 +302,9 @@ public class DefaultVoicemailNotifier { 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 @@ public class DefaultVoicemailNotifier { 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(); |