Merge cherrypicks of [9427496, 9427497, 9427498, 9427499, 9427540, 9427541, 9427522, 9427523, 9427525, 9427526, 9427527, 9427504, 9427542, 9427505, 9427468, 9427469, 9427506, 9427236, 9427238, 9427239, 9427454, 9427455, 9427561, 9427390, 9427470, 9427456, 9427472, 9427393, 9427531, 9427213, 9427459, 9427581, 9427583, 9427545, 9427362, 9427563, 9427564, 9427533, 9427534, 9427546, 9427395, 9427397, 9427475, 9427565, 9427535] into qt-release
Change-Id: I2415446926daa88c037a09c6675342ee111d3add
diff --git a/android/sqlite3_android.cpp b/android/sqlite3_android.cpp
index 659ee6c..d65f872 100644
--- a/android/sqlite3_android.cpp
+++ b/android/sqlite3_android.cpp
@@ -231,6 +231,7 @@
UCollator* collator;
};
+#if 0
/**
* This function is invoked as:
*
@@ -407,6 +408,7 @@
} while ((token = u_strtok_r(NULL, delim, &state)) != NULL);
sqlite3_result_int(context, numTokens);
}
+#endif
static void localized_collator_dtor(UCollator* collator)
{
@@ -451,6 +453,7 @@
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) {
@@ -464,6 +467,7 @@
if (err != SQLITE_OK) {
return err;
}
+#endif
//// PHONEBOOK_COLLATOR
status = U_ZERO_ERROR;
