Fix NPE in lookupContactFromUri
Trap NPE thrown by pre-N CP2.
Bug:25941069
Change-Id: Id510e84e6e7e4a63a9b3267c183e23b73b0fabbc
diff --git a/src/com/android/dialer/calllog/ContactInfoHelper.java b/src/com/android/dialer/calllog/ContactInfoHelper.java
index 52d1437..5b6c52b 100644
--- a/src/com/android/dialer/calllog/ContactInfoHelper.java
+++ b/src/com/android/dialer/calllog/ContactInfoHelper.java
@@ -157,9 +157,14 @@
return ContactInfo.EMPTY;
}
- Cursor phoneLookupCursor = mContext.getContentResolver().query(uri,
- PhoneQuery.PHONE_LOOKUP_PROJECTION, null, null, null);
-
+ Cursor phoneLookupCursor = null;
+ try {
+ phoneLookupCursor = mContext.getContentResolver().query(uri,
+ PhoneQuery.PHONE_LOOKUP_PROJECTION, null, null, null);
+ } catch (NullPointerException e) {
+ // Trap NPE from pre-N CP2
+ return null;
+ }
if (phoneLookupCursor == null) {
return null;
}