diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-08-04 23:33:14 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-08-04 23:33:14 -0700 |
| commit | 02123b7cc8336ec5481f20c12ce5c7f2b9f044d4 (patch) | |
| tree | 6bc9f38d81bb46fda3335334eff162128e4bdc5d | |
| parent | aabcd1d34a71ad06ee0a9395331540484f1ceb17 (diff) | |
| download | ContactsProvider-02123b7cc8336ec5481f20c12ce5c7f2b9f044d4.tar.gz | |
Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit 633d446a
Change-Id: I0f96f14dfffd9fa8e3bd2480c3de0518818616e7
| -rw-r--r-- | src/com/android/providers/contacts/NameNormalizer.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/providers/contacts/NameNormalizer.java b/src/com/android/providers/contacts/NameNormalizer.java index f40a632a..6dfe8bdd 100644 --- a/src/com/android/providers/contacts/NameNormalizer.java +++ b/src/com/android/providers/contacts/NameNormalizer.java @@ -16,8 +16,10 @@ package com.android.providers.contacts; import com.ibm.icu4jni.text.CollationAttribute; +import com.ibm.icu4jni.text.CollationKey; // TODO: java.text.CollationKey post-froyo import com.ibm.icu4jni.text.Collator; import com.ibm.icu4jni.text.RuleBasedCollator; +import java.util.Locale; /** * Converts a name to a normalized form by removing all non-letter characters and normalizing @@ -27,14 +29,14 @@ public class NameNormalizer { private static final RuleBasedCollator sCompressingCollator; static { - sCompressingCollator = (RuleBasedCollator)Collator.getInstance(null); + sCompressingCollator = (RuleBasedCollator)Collator.getInstance(Locale.getDefault()); sCompressingCollator.setStrength(Collator.PRIMARY); sCompressingCollator.setDecomposition(Collator.CANONICAL_DECOMPOSITION); } private static final RuleBasedCollator sComplexityCollator; static { - sComplexityCollator = (RuleBasedCollator)Collator.getInstance(null); + sComplexityCollator = (RuleBasedCollator)Collator.getInstance(Locale.getDefault()); sComplexityCollator.setStrength(Collator.TERTIARY); sComplexityCollator.setAttribute(CollationAttribute.CASE_FIRST, CollationAttribute.VALUE_LOWER_FIRST); @@ -45,7 +47,8 @@ public class NameNormalizer { * of names. It ignores non-letter characters and removes accents. */ public static String normalize(String name) { - return Hex.encodeHex(sCompressingCollator.getSortKey(lettersAndDigitsOnly(name)), true); + CollationKey key = sCompressingCollator.getCollationKey(lettersAndDigitsOnly(name)); + return Hex.encodeHex(key.toByteArray(), true); } /** |