diff options
| author | Elliott Hughes <enh@google.com> | 2016-09-13 17:13:29 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2016-09-13 17:37:03 -0700 |
| commit | 153c102e5ba0ff0e8df7a862c8f4e449007d04ad (patch) | |
| tree | 8f7a7a58af245086287a216ed8d7dd58d5f5c40d /android/sqlite3_android.cpp | |
| parent | 4a162d281a25f02a158c33b28570a368a0c18882 (diff) | |
external/sqlite/android cleanup.
Removes dead use of deprecated ucol_getShortDefinitionString.
Converts PhoneNumberUtils tests to gtest.
Bug: http://b/31459453
Change-Id: I4662e25d711868e21afb0661602c64852f0cef65
Diffstat (limited to 'android/sqlite3_android.cpp')
| -rw-r--r-- | android/sqlite3_android.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/android/sqlite3_android.cpp b/android/sqlite3_android.cpp index b836952..7356f9d 100644 --- a/android/sqlite3_android.cpp +++ b/android/sqlite3_android.cpp @@ -415,10 +415,7 @@ static void localized_collator_dtor(UCollator* collator) extern "C" int register_localized_collators(sqlite3* handle, const char* systemLocale, int utf16Storage) { - int err; UErrorCode status = U_ZERO_ERROR; - void* icudata; - UCollator* collator = ucol_open(systemLocale, &status); if (U_FAILURE(status)) { return -1; @@ -429,10 +426,7 @@ extern "C" int register_localized_collators(sqlite3* handle, const char* systemL return -1; } - status = U_ZERO_ERROR; - char buf[1024]; - ucol_getShortDefinitionString(collator, NULL, buf, 1024, &status); - + int err; if (utf16Storage) { err = sqlite3_create_collation_v2(handle, LOCALIZED_COLLATOR_NAME, SQLITE_UTF16, collator, collate16, (void(*)(void*))localized_collator_dtor); @@ -459,7 +453,6 @@ extern "C" int register_localized_collators(sqlite3* handle, const char* systemL return err; } - //// PHONEBOOK_COLLATOR status = U_ZERO_ERROR; collator = ucol_open(systemLocale, &status); @@ -473,8 +466,6 @@ extern "C" int register_localized_collators(sqlite3* handle, const char* systemL return -1; } - status = U_ZERO_ERROR; - // ucol_getShortDefinitionString(collator, NULL, buf, 1024, &status); if (utf16Storage) { err = sqlite3_create_collation_v2(handle, PHONEBOOK_COLLATOR_NAME, SQLITE_UTF16, collator, collate16, (void(*)(void*))localized_collator_dtor); @@ -552,8 +543,9 @@ extern "C" int register_android_functions(sqlite3 * handle, int utf16Storage) #endif // Register the _PHONE_NUMBER_STRIPPED_REVERSED function, which imitates - // PhoneNumberUtils.getStrippedReversed. This function is not public API, - // it is only used for compatibility with Android 1.6 and earlier. + // PhoneNumberUtils.getStrippedReversed. This function is used by + // packages/providers/ContactsProvider/src/com/android/providers/contacts/LegacyApiSupport.java + // to provide compatibility with Android 1.6 and earlier. err = sqlite3_create_function(handle, "_PHONE_NUMBER_STRIPPED_REVERSED", 1, SQLITE_UTF8, NULL, |