commit 516c95472d83a85769285c54fe9bc949c62a645a
author Yorke Lee <yorkelee@google.com> Thu May 01 18:21:30 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 01 18:21:30 2014 +0000
tree 190096f4ae8ded6f706cc0c45bc58b83366b9455
parent 4289a4f4ca951dab39cd9333b03d3c9f1f4ed3d2
parent e2390461aa1612028f59760af57230cff8ab261b

am e2390461: Merge "Fix crash in Dialer when CP2 is disabled"

* commit 'e2390461aa1612028f59760af57230cff8ab261b':
  Fix crash in Dialer when CP2 is disabled

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

diff --git a/src/com/android/dialer/calllog/CallLogQueryHandler.java b/src/com/android/dialer/calllog/CallLogQueryHandler.java
index 3992676..64eddec 100644
--- a/src/com/android/dialer/calllog/CallLogQueryHandler.java
+++ b/src/com/android/dialer/calllog/CallLogQueryHandler.java
@@ -112,6 +112,8 @@
                 Log.w(TAG, "Exception on background worker thread", e);
             } catch (SQLiteDatabaseCorruptException e) {
                 Log.w(TAG, "Exception on background worker thread", e);
+            } catch (IllegalArgumentException e) {
+                Log.w(TAG, "ContactsProvider not present on device", e);
             }
         }
     }