commit f615d9c682a5be33576f5e691532185810d169d2
author Yorke Lee <yorkelee@google.com> Fri May 15 00:48:04 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 15 00:48:04 2015 +0000
tree e8b65e316b80a2ae1a859fda9e77f88750e18fb7
parent 51cb9cf6158b7e077110f3d5a704a3b3673795b1
parent 4f2b0708448e477ecac9f657fc5cb910eb07f2de

am 4f2b0708: am 64605820: Fix NPE in CallLogProviderWorker

* commit '4f2b0708448e477ecac9f657fc5cb910eb07f2de':
  Fix NPE in CallLogProviderWorker

src/com/android/providers/contacts/CallLogProvider.java

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 @@
                     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,