summaryrefslogtreecommitdiff
path: root/android
Commit message (Collapse)AuthorAgeFilesLines
* sqlite: Remove useless function of tokenizeJinguang Dong2019-03-041-191/+0
| | | | | | | | | | | | Remove useless tokenize function as well the corresponding sqlite3_create_function Bug: none Test: sqlite unit tests Change-Id: Id4238ee2ac0b8f3fde1eedaa09d5340b5937fde1 Signed-off-by: Jizhong Wang <wangjizhong@huawei.com> Signed-off-by: mydongistiny <jaysonedson@gmail.com>
* Fix parameter checking logic error in tokenizeJinguang Dong2019-03-041-1/+1
| | | | | | | | | | | | | Tokenize requires 4 to 6 arguments. If this condition is not met, the program will return. But the judgment logic is always false. It should to change the '||' to '&&' operation. Bug: none Test: sqlite unit tests Change-Id: Id4238ee2ac0b8f3fde1eedaa09d5340b5937fde1 Signed-off-by: Jizhong Wang <wangjizhong@huawei.com> Signed-off-by: mydongistiny <jaysonedson@gmail.com>
* Merge "Use -Werror in external/sqlite" am: 0d42d6b303 am: 545d8fbaaf am: ↵Chih-Hung Hsieh2017-09-291-1/+7
|\ | | | | | | | | | | | | | | 2384f6bc0b am: 344ea259af Change-Id: Ie6a11319dbbdc35637895db1e60c149e301faf9f
| * Use -Werror in external/sqliteChih-Hung Hsieh2017-09-291-1/+7
| | | | | | | | | | | | | | | | * Supress non-critical warnings. Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: Id116ab578184a9d43ca4a8549e78889b79ea49aa
| * ICU is disabled by Android.bpJiyong Park2017-09-072-7/+2
| | | | | | | | | | | | | | | | | | | | | | By using vendor.cflags, SQLITE_ENABLE_ICU is on/off from Android.bp. No need to def/undef it inside the source code. Bug: 64514237 Test: BOARD_VNDK_VERSION=current m -j libsqlite libsqlite.vendor Merged-In: If9771fa020e528445275281017e424a5bbc2ae99 Change-Id: If9771fa020e528445275281017e424a5bbc2ae99 (cherry picked from commit 633397eeef296584d3242d8a72790dcf11bb36fd)
| * Mark libsqlite as vendor_availableJiyong Park2017-09-051-1/+2
| | | | | | | | | | | | | | | | | | | | There are some vendor libs that are using libsqlite. So marking it as vendor_available. Bug: 37560614 Test: BOARD_VNDK_VERSION=current m -j libsqlite.vendor Change-Id: I45823c4d42071f505583a955564cdd78742e8029 Merged-In: I45823c4d42071f505583a955564cdd78742e8029
| * Don't use ICU when built for vendorsJiyong Park2017-08-102-2/+29
| | | | | | | | | | | | | | | | | | | | | | libicuuc.so isn't available for vendors, thus ICU is turned off when libsqlite is built for vendors. Bug: 64104535 Test: BOARD_VNDK_VERSION=current m -j libsqlite.vendor Merged-In: I682502ba5bdc5f76a0363a95d01b1081c1bc01a4 Change-Id: I682502ba5bdc5f76a0363a95d01b1081c1bc01a4 (cherry picked from commit b4076dfd66f114263a1f70cf3ba73c2d55ccb3b0)
* | Merge "Fix false positives comparing local and intl numbers"Francisco Pimenta2017-09-184-60/+307
|\ \
| * | Fix false positives comparing local and intl numbersFrancisco Pimenta2017-07-184-60/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when comparing local phone numbers with international it was possible to match the wrong number because the first digit of the area code was being treated as a skippable trunk digit, e.g: "550-123-4567" would be considered equal to "+14501234567". Since there are two different algorithms (loose/old and strict) there are two solutions with the same basic goal: Only ignore mismatches if there's an actual extra digit which could possibly be the trunk digit, i.e: "0550-123-4567" is acceptable as equal to "+15501234567". NB: The US not having a trunk digit to begin with is a different issue entirely - the code is agnostic on which country has which trunk digits! For "loose" matching we achieve this by checking the length of the mismatch. For "strict" matching we keep track of the supposed trunk digit and compare it against the current position in match. So for the above example 5 != 4. Several new unit tests were added (including replicating tests for OldPhoneNumberUtils). I broke down the c++ tests into smaller methods for additional readability. NB: By adding more tests I uncovered that two digit trunk prefixes were never handled correctly for the "strict" matching case. "Loose" matching is much more robust. I commented out the "strict" test cases. Test: All unit tests pass for PhoneNumberUtilsTest, OldPhoneNumberUtilsTest and DatabaseGeneralTest. Bug: 63179537 Bug: 63178542 Bug: 62916088 Change-Id: Idc2a1c2c2f64ed29995208503de4755c521e1c82
* | | ICU is disabled by Android.bpJiyong Park2017-08-112-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | By using vendor.cflags, SQLITE_ENABLE_ICU is on/off from Android.bp. No need to def/undef it inside the source code. Bug: 64514237 Test: BOARD_VNDK_VERSION=current m -j libsqlite libsqlite.vendor Change-Id: If9771fa020e528445275281017e424a5bbc2ae99
* | | Don't use ICU when built for vendorsJiyong Park2017-08-102-2/+29
|/ / | | | | | | | | | | | | | | | | libicuuc.so isn't available for vendors, thus ICU is turned off when libsqlite is built for vendors. Bug: 64104535 Test: BOARD_VNDK_VERSION=current m -j libsqlite.vendor Change-Id: I682502ba5bdc5f76a0363a95d01b1081c1bc01a4
* / Mark libsqlite as vendor_availableJiyong Park2017-06-261-1/+2
|/ | | | | | | | | There are some vendor libs that are using libsqlite. So marking it as vendor_available. Bug: 37560614 Test: BOARD_VNDK_VERSION=current m -j libsqlite.vendor Change-Id: I45823c4d42071f505583a955564cdd78742e8029
* Convert external/sqlite to Android.bpColin Cross2017-04-193-34/+32
| | | | | | | See build/soong/README.md for more information. Test: m -j checkbuild Change-Id: I649eecd3948fbe49bb153b14a8eae9b110a79734
* external/sqlite/android cleanup.Elliott Hughes2016-09-133-145/+78
| | | | | | | | | Removes dead use of deprecated ucol_getShortDefinitionString. Converts PhoneNumberUtils tests to gtest. Bug: http://b/31459453 Change-Id: I4662e25d711868e21afb0661602c64852f0cef65
* Rename libicuuc-host/libicui18n-host to libicuuc/libicui18nDan Willemsen2016-09-121-1/+1
| | | | | | | | | | | | These modules can be named the same between the target and host libraries, which simplifies references to them, particularly in Soong. To prevent accidentally loading the system copy of the library, we still rename the installed name to be libicu*-host.so. But modules do not need to know that in order to build against them. Change-Id: I4735599feb73225b2bea6dee42bbc23118693765
* Remove hardcoded ICU include paths.Narayan Kamath2015-01-051-6/+5
| | | | | | | ICU exports them using LOCAL_EXPORT_C_INCLUDE_DIRS. bug: 18581021 Change-Id: I98048a4f6a9163fff6d3a71712d8249b2b00d04b
* Switch sqlite to the new icu.Elliott Hughes2014-07-091-2/+2
| | | | Change-Id: I16a4b5c0d7b46a4edd61d75ba017669b0daafc90
* Remove deprecated WITH_HOST_DALVIK.Ian Rogers2014-05-231-8/+6
| | | | | Bug: 13751317 Change-Id: I64e66eb34dbe10b39ec2e8c37da0038705b4931f
* add static dependency on liblogColin Cross2013-07-231-0/+2
| | | | Change-Id: I21a4e18f0d2aacaf76421b62d693c2ae7eb08f30
* am b4e9e379: Merge "fix build problem, when #define ENABLE_ANDROID_LOG 1"Elliott Hughes2013-03-061-1/+1
|\ | | | | | | | | * commit 'b4e9e379e360464d3d6bde3084e5b286238a9329': fix build problem, when #define ENABLE_ANDROID_LOG 1
| * fix build problem, when #define ENABLE_ANDROID_LOG 1Hyejin Kim2013-03-061-1/+1
| | | | | | | | Change-Id: I514750dd33ff5bd433d4ee167a2401d829d2fbe9
* | Remove GET_PHONEBOOK_INDEX callbackJay Shrauner2013-02-255-581/+1
| | | | | | | | | | | | | | Remove sqlite GET_PHONEBOOK_INDEX callback. Bug: Change-Id: I751bb4fdff89af1eccc4b21b67fddd0b802eeb61
* | Fix contacts index labels for i18nJay Shrauner2013-02-057-780/+430
|/ | | | | | | | 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
* am 38d33f70: am 1eabc582: Merge "GetPhonebookIndex: Fix handling for minor ↵Jean-Baptiste Queru2012-05-012-5/+48
|\ | | | | | | | | | | | | Japanese kana characters" * commit '38d33f70401037d36fcad72c4b4199890755a66b': GetPhonebookIndex: Fix handling for minor Japanese kana characters
| * GetPhonebookIndex: Fix handling for minor Japanese kana charactersYutaro Ogasawara2011-12-182-5/+48
| | | | | | | | | | | | | | | | | | | | | | This adds minor Japanese kana character handling to meet the unicode collation algorithm. -Normalize digraphs (yori, koto) into first reading letter. -Treat dakuten, dot, onbiki, iteration marks as a symbol. -Add handling for minor small katakana letter. Signed-off-by: Yutaro Ogasawara <yutaro.ogasawara@gmail.com>
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-061-11/+11
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I5ffb58901712f4db93de474c30833a46ebb4bc7c
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-031-1/+1
|/ | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: Iad9bddb01ef0d9b28e3969b9f8dfbb2cc2830b30
* Allow _DELETE_FILE trigger to delete files on secondary external storageMike Lockwood2011-07-071-6/+22
| | | | | Change-Id: I5281dda013f909c050fda712d3a0816173df277d Signed-off-by: Mike Lockwood <lockwood@android.com>
* Revert "Allow _DELETE_FILE trigger to delete files in /data/media"Mike Lockwood2011-01-121-7/+2
| | | | | | | | | The media provider is now using the emulated /mnt/sdcard file system, so this change is no longer necessary. This reverts commit 439e88e7d09bfeac4690f2d9df6533955aa4fa88. Change-Id: Ied12275767e3a399d7e455ac2102527ccd8b888d
* DO NOT MERGE. Adding a custom function to support legacy API compatibilityDmitri Plotnikov2011-01-064-2/+107
| | | | | Bug: 3210604 Change-Id: Ie65c053ec5178d6cd991f69a5a2b6d5d51938ade
* Update to new Unicode.h includesKenny Root2010-11-152-13/+14
| | | | Change-Id: Ibb9ca5833f9c0b3313ff0e9bc70348d268aaf4e2
* Allow _DELETE_FILE trigger to delete files in /data/mediaMike Lockwood2010-10-051-2/+7
| | | | | Change-Id: I8a3f620cd6633f2be47ac05e17ea642f00b71e91 Signed-off-by: Mike Lockwood <lockwood@android.com>
* resolved conflicts for merge of 90f23688 to masterJesse Wilson2010-09-151-4/+13
|\ | | | | | | Change-Id: Ifa97db751da1aeeeb9d7450b04c909f0800ce140
| * Support sqlite on the dalvikvm host build.Jesse Wilson2010-09-141-4/+13
| | | | | | | | Change-Id: I900daf7f205f8f666eac9c4070d2e5c99d85b3b3
| * Fix problem with const result from strchr() [DO NOT MERGE]Mike Lockwood2010-08-241-1/+1
| | | | | | | | | | | | | | | | Needed for simulator build on newer Ubuntu distributions. Based on Ibb8cd3cdb4feae89a20eec56131e322f39721b1a Change-Id: Ie574888128265e026973a5ac88ede87730eda7d4
* | Put digits into an own segment with the title #Daniel Lehmann2010-08-181-1/+8
| | | | | | | | Change-Id: I5f3ae179d388c417abd512974df22fd78a699354
* | Fix problem with const result from strchr()Mike Lockwood2010-05-191-1/+1
|/ | | | | | | Needed for simulator build on newer Ubuntu distributions. Change-Id: Ibb8cd3cdb4feae89a20eec56131e322f39721b1a Signed-off-by: Mike Lockwood <lockwood@android.com>
* Add PHONEBOOK_COLLATOR toward SQLite so that database users are able to sort ↵Daisuke Miyakawa2010-03-181-1/+40
| | | | | | | | | | | | | | | | | | | | | | based on phonebook in ja_JP locale. In the future, we may able to use PHONEBOOK_COLLATOR in the other locales, but we don't use the other phonebook collator now since we cannot estimate how impactful the change is. Now we have a customized phonebook collator in Japanese and we need it in ContactsProvider, we'll use only the collator. Do not use this collator in the other packages and locales now. We may decide revert it in the near future after furter investigatons. Need to submit I4dd1b047 to make this change actually effective. Without the change, we will have a phonebook collator for "previous" locale, not the current one. Bug: 2514026 Bug: 2373557 Bug: 2373553 Change-Id: If6f548c0a80fe01e779b4dfc46f74224003f1798
* Remove getPhoneticallySortableString() and its SQLite variant, both of which ↵Daisuke Miyakawa2010-03-174-369/+1
| | | | | | | | are now obsolete because we already have icu's collator. Remain getNormalizedString() but remove SQLite variant since the C function is used internally. Change-Id: If1e4b8388087b78e0f6418ac3c7be4c23f67ee0e
* Read external storage name from EXTERNAL_STORAGE variable.Ray Chen2010-03-121-2/+3
| | | | Change-Id: I9d5bd02f23882dd85e91075e897150cafa33ffe5
* Changing the phone book index for Japanese word "other"Dmitri Plotnikov2010-03-041-4/+2
| | | | | Bug: 2487471 Change-Id: I90cef4eb2468c0a58067df984ee98da438aa0e5a
* Implementing traditional grouping of Hiragana characters in contacts listsDmitri Plotnikov2010-03-033-38/+90
| | | | | Bug: 2407129 Change-Id: I8d83f9012846f61484b76f718e8127090eba39ec
* Introducing a new SQLite extension function: GET_PHONEBOOK_INDEXDmitri Plotnikov2010-03-034-12/+264
| | | | | | | | This function will produce a normalized upper case first letter from a given string. Bug: 2407129 Change-Id: Idfafca04342d43ef43cfdff0e431e0a6a8cf5c68
* bug #2180646: make comparing "404-04" and "40404" return true in the native ↵Wei Huang2009-10-231-4/+10
| | | | | | sqlite (loose) phone number comparison method. - when comparing two numbers whose dialable char length is less than the MIN_MATCH (7), treat them as equal if the dialable portion of the numbers match.
* fix failing test.Wei Huang2009-09-211-1/+1
| | | | Change-Id: I11fc145464e29364dbf302c1e607a07031e1821d
* make native sqlite phone_number_compare_loosely use MIN_MATCH of 7 instead of 5.Wei Huang2009-09-201-2/+2
| | | | Change-Id: Ie0dde105e810c07e05471182cd0c0f81045731ef
* Small changeDaisuke Miyakawa2009-09-201-1/+1
|
* Revert the default phone number comparation algorithm.Daisuke Miyakawa2009-09-206-11/+327
| | | | | | | | | Now developers have to explicitly set the third argument of PHONE_NUMBERS_COMPARE() into 1, when they want to use "strict" phone number comparation algorithm, which was used in Donut. In default, PHONE_NUMBER_COMPARE() now uses "loose" phone number comparation algorithm, which had been used in Cupcake. Internal issue id: 1892808
* Fix the implementation of phone_number_compare in accordance with the tests ↵Daisuke Miyakawa2009-09-023-17/+67
| | | | | | in PhoneNumberUtils.java. Due to the Thailand's special case, the code became a little nastier than before, but I believe it is inevitable...
* Merge change 23409 into donutAndroid (Google) Code Review2009-08-312-3/+14
|\ | | | | | | | | * changes: Avoid a buffer overrun in GET_NORMALIZED_STRING.