diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-12-03 23:14:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-03 23:14:58 +0000 |
| commit | 7b99e6b1484c73dc520874552e698add4dc96038 (patch) | |
| tree | d237f9f3505184986535c42834eb39e33d903ec3 | |
| parent | c90342c9fe579b481720b87f03f1808f7a2272de (diff) | |
| parent | e151b4806402ac576bf75444d00cca5dbe61f2e1 (diff) | |
Merge "Merge Android10 QPR1 into AOSP master"
| -rw-r--r-- | android/sqlite3_android.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/android/sqlite3_android.cpp b/android/sqlite3_android.cpp index d2f1802..d204bd0 100644 --- a/android/sqlite3_android.cpp +++ b/android/sqlite3_android.cpp @@ -237,6 +237,7 @@ struct SqliteUserData { UCollator* collator; }; +#if 0 /** * This function is invoked as: * @@ -413,6 +414,7 @@ static void tokenize(sqlite3_context * context, int argc, sqlite3_value ** argv) } while ((token = u_strtok_r(NULL, delim, &state)) != NULL); sqlite3_result_int(context, numTokens); } +#endif static void localized_collator_dtor(UCollator* collator) { @@ -457,6 +459,7 @@ extern "C" int register_localized_collators(sqlite3* handle __attribute((unused) return err; } +#if 0 // Register the _TOKENIZE function err = sqlite3_create_function(handle, "_TOKENIZE", 4, SQLITE_UTF16, collator, tokenize, NULL, NULL); if (err != SQLITE_OK) { @@ -470,6 +473,7 @@ extern "C" int register_localized_collators(sqlite3* handle __attribute((unused) if (err != SQLITE_OK) { return err; } +#endif //// PHONEBOOK_COLLATOR status = U_ZERO_ERROR; |