summaryrefslogtreecommitdiff
path: root/android/sqlite3_android.cpp
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2012-12-17 11:12:30 -0800
committerJay Shrauner <shrauner@google.com>2013-02-05 16:14:59 -0800
commitdb8a386d111b11463c877b3a14ab62aec761a3f5 (patch)
tree1a76447eebd49c0b3a5e605a64a1ec74ec942dee /android/sqlite3_android.cpp
parent7dbe9638c4c7cdb01a71528d8cb1f0065120d7b8 (diff)
Fix contacts index labels for i18n
Switch ContactsProvider to using ICU for generation of index labels, and remove custom KO and JA code. Add i18n test cases. Bug:7351596 Change-Id: I7ac25add8b29ff2c6c395f04a83b279b541e4125
Diffstat (limited to 'android/sqlite3_android.cpp')
-rw-r--r--android/sqlite3_android.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/android/sqlite3_android.cpp b/android/sqlite3_android.cpp
index 5daf15e..fe826fd 100644
--- a/android/sqlite3_android.cpp
+++ b/android/sqlite3_android.cpp
@@ -509,14 +509,8 @@ extern "C" int register_localized_collators(sqlite3* handle, const char* systemL
//// PHONEBOOK_COLLATOR
- // The collator may be removed in the near future. Do not depend on it.
- // TODO: it might be better to have another function for registering phonebook collator.
status = U_ZERO_ERROR;
- if (strcmp(systemLocale, "ja") == 0 || strcmp(systemLocale, "ja_JP") == 0) {
- collator = ucol_open("ja@collation=phonebook", &status);
- } else {
- collator = ucol_open(systemLocale, &status);
- }
+ collator = ucol_open(systemLocale, &status);
if (U_FAILURE(status)) {
return -1;
}