Handle account==null instead of throwing NullPointerException

Bug:2528419

Change-Id: I30bbdc5fcc8d1259c36bfe04badf32e3e034d1f3

1 files changed, 4 insertions, 4 deletions

diff --git a/src/com/android/providers/contacts/ContactAggregator.java b/src/com/android/providers/contacts/ContactAggregator.java
index 88270c19..de55f93a 100644
--- a/src/com/android/providers/contacts/ContactAggregator.java
+++ b/src/com/android/providers/contacts/ContactAggregator.java
@@ -1206,10 +1206,10 @@ public class ContactAggregator {
 
                         // For now, just choose the first photo in a list sorted by account name.
                         String account = c.getString(RawContactsQuery.ACCOUNT_NAME);
-                        if (!foundSuperPrimaryPhoto
-                                && (superprimary
-                                        || photoAccount == null
-                                        || photoAccount.compareToIgnoreCase(account) >= 0)) {
+                        if (!foundSuperPrimaryPhoto && (
+                                superprimary || photoAccount == null ||
+                                (account != null &&
+                                photoAccount.compareToIgnoreCase(account) >= 0))) {
                             photoAccount = account;
                             bestPhotoId = dataId;
                             foundSuperPrimaryPhoto |= superprimary;