From 3ef26b5979ca194cc0a528825794be0386508ccf Mon Sep 17 00:00:00 2001
From: Jay Shrauner <shrauner@google.com>
Date: Fri, 23 May 2014 13:12:01 -0700
Subject: Fix aggregation merging of null display names

Fix aggregation merging if first raw contact lacks a display name.

Bug:15192402
Change-Id: Ibf125c1bbe7f5fc55302ea66ec405567930de300
---
 src/com/android/providers/contacts/NameNormalizer.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/com/android/providers/contacts/NameNormalizer.java')

diff --git a/src/com/android/providers/contacts/NameNormalizer.java b/src/com/android/providers/contacts/NameNormalizer.java
index e3f98a82..e48727b9 100644
--- a/src/com/android/providers/contacts/NameNormalizer.java
+++ b/src/com/android/providers/contacts/NameNormalizer.java
@@ -102,8 +102,12 @@ public class NameNormalizer {
 
     /**
      * Returns a string containing just the letters and digits from the original string.
+     * Returns empty string if the original string is null.
      */
     private static String lettersAndDigitsOnly(String name) {
+        if (name == null) {
+            return "";
+        }
         char[] letters = name.toCharArray();
         int length = 0;
         for (int i = 0; i < letters.length; i++) {
-- 
cgit v1.2.3