summaryrefslogtreecommitdiffstats
path: root/src/com/android/providers/contacts/NameNormalizer.java
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2014-05-23 13:12:01 -0700
committerJay Shrauner <shrauner@google.com>2014-05-27 13:31:30 -0700
commit3ef26b5979ca194cc0a528825794be0386508ccf (patch)
treeebaf8629fdf7fdc2723451c92930a3b5e0849ec3 /src/com/android/providers/contacts/NameNormalizer.java
parent9984dca0b705d0b8e1556c06f73ba3f05a85d517 (diff)
downloadpackages_providers_ContactsProvider-3ef26b5979ca194cc0a528825794be0386508ccf.tar.gz
packages_providers_ContactsProvider-3ef26b5979ca194cc0a528825794be0386508ccf.tar.bz2
packages_providers_ContactsProvider-3ef26b5979ca194cc0a528825794be0386508ccf.zip
Fix aggregation merging of null display names
Fix aggregation merging if first raw contact lacks a display name. Bug:15192402 Change-Id: Ibf125c1bbe7f5fc55302ea66ec405567930de300
Diffstat (limited to 'src/com/android/providers/contacts/NameNormalizer.java')
-rw-r--r--src/com/android/providers/contacts/NameNormalizer.java4
1 files changed, 4 insertions, 0 deletions
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++) {