summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-05-14 16:35:17 -0700
committerYorke Lee <yorkelee@google.com>2015-05-14 16:35:17 -0700
commit64605820a3c27ca1d1bf2499aea8418bb80621d0 (patch)
tree7d20c9e1de11cc3a647cf7e4974f7b66c30ced99 /src
parent61ec18168fea70e5c10a28776fd5b9257d9961bc (diff)
downloadpackages_providers_ContactsProvider-64605820a3c27ca1d1bf2499aea8418bb80621d0.zip
packages_providers_ContactsProvider-64605820a3c27ca1d1bf2499aea8418bb80621d0.tar.gz
packages_providers_ContactsProvider-64605820a3c27ca1d1bf2499aea8418bb80621d0.tar.bz2
Fix NPE in CallLogProviderWorker
Bug: 20979730 Change-Id: I8ccaa27613804891b958dd82ac2debeb0dad762b
Diffstat (limited to 'src')
-rw-r--r--src/com/android/providers/contacts/CallLogProvider.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java
index 76481bd..b5dbd06 100644
--- a/src/com/android/providers/contacts/CallLogProvider.java
+++ b/src/com/android/providers/contacts/CallLogProvider.java
@@ -515,7 +515,7 @@ public class CallLogProvider extends ContentProvider {
if (tm != null) {
PhoneAccount account = tm.getPhoneAccount(handle);
- if (account != null) {
+ if (account != null && account.getAddress() != null) {
// We did not find any items for the specific phone account, so run the
// query based on the phone number instead.
mDbHelper.getWritableDatabase().execSQL(UNHIDE_BY_ADDRESS_QUERY,