commit 2e239bd445fb3582e0faa096c7e9ec8c4d08e003
author Victor Chang <vichang@google.com> Wed Mar 30 19:21:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 30 19:21:27 2016 +0000
tree feea7e42bf4313dd4d6397364b84b367c96ba7cc
parent e3947b9e71b418e3fbb1abd39f2f6e49993b2958
parent 758ba199a0a2bce7c69bfcc751bb16138bb6e609

[DO NOT MERGE] Fix Dialer crash loop for caller id in personal contact directory
am: 758ba19

* commit '758ba199a0a2bce7c69bfcc751bb16138bb6e609':
  [DO NOT MERGE] Fix Dialer crash loop for caller id in personal contact directory

Change-Id: Id4b9f738f6ed57d5c5e76c17a6db427c24ff985c

src/com/android/dialer/calllog/ContactInfoHelper.java

diff --git a/src/com/android/dialer/calllog/ContactInfoHelper.java b/src/com/android/dialer/calllog/ContactInfoHelper.java
index 6e84a92..b0ef0ab 100644
--- a/src/com/android/dialer/calllog/ContactInfoHelper.java
+++ b/src/com/android/dialer/calllog/ContactInfoHelper.java
@@ -224,6 +224,8 @@
             if (cursor != null && cursor.moveToFirst()) {
                 return cursor.getString(PhoneQuery.NAME_ALTERNATIVE);
             }
+        } catch (IllegalArgumentException e) {
+            // Avoid dialer crash when lookup key is not valid
         } finally {
             if (cursor != null) {
                 cursor.close();