summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | am d109b237: am ff91ec35: Tolerate crashes during re-aggregation.Makoto Onuki2012-07-203-6/+47
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * commit 'd109b23736e4171d23356642bd5dbe28743341da': Tolerate crashes during re-aggregation.
| * | | | am ff91ec35: Tolerate crashes during re-aggregation.Makoto Onuki2012-07-193-7/+48
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| * commit 'ff91ec356f1b17dea095a880f61b8bc4ff333b1e': Tolerate crashes during re-aggregation.
| | * | Tolerate crashes during re-aggregation.Makoto Onuki2012-07-183-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL consists of two parts: - Don't crash even if the name_lookup table contains malformed data. Just treat it as name-unmatch. - Don't crash even if an exception is thrown durign re-aggregation. Re-aggregation is not *that* important anyway, so in that case just bump the logic version and start the provider normally. (And even if we fail to bump the version number, just go ahead and continue.) Bug 6827136 Change-Id: Ifa3d4697c5d81f3480e0b8a9238b49312ac75e3b
* | | | am 5a2cfba2: am 084a9d5e: Don\'t sort contacts supplied to global search app.Mathew Inwood2012-07-041-131/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5a2cfba2623b8606ec5eb1a8e443957da2495e84': Don't sort contacts supplied to global search app.
| * | | am 084a9d5e: Don\'t sort contacts supplied to global search app.Mathew Inwood2012-07-041-131/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '084a9d5ee564c758ff7709690ab404d6ac58e78d': Don't sort contacts supplied to global search app.
| | * | Don't sort contacts supplied to global search app.Mathew Inwood2012-07-041-131/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are to be sorted by the global search app itself instead. While we're at it, also remove 'create contact' and 'dial number' suggestions since they're not used. Change-Id: I0c56f638e347d101468e22d8fb2417552891eaa9
* | | | Reorganize import in contacts providerMakoto Onuki2012-06-2741-219/+218
| | | | | | | | | | | | | | | | Change-Id: If3afb134ea36bd93859efcd114885526e1592b91
* | | | Merge "Replace transparency with white for all pictures"Makoto Onuki2012-06-261-23/+56
|\ \ \ \
| * | | | Replace transparency with white for all picturesMakoto Onuki2012-06-251-23/+56
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug 5261517 Change-Id: I6c16bb1f9897589beec222fc63ad899cd478b923
* | | | Fix transaction handling in the providerMakoto Onuki2012-06-255-206/+328
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issues that will happen when a batch operation for applyBatch() contain operations for both the contacts db and the profile db. - Make sure to set the right transaction listener when starting a transaction. There were cases where we started a transaction on the contacts db but passsing the profile provider as the listener, and vice versa. - Make sure transaction callbacks operate on the correct DB. There were cases where ContactsProvider2.onCommit() and its sbilings would operate on the profile DB, not on the contacts db. - Change the transaction finishing order. When we start transactions on both the contacts and the profile DB, we do so on the contacts db first, and then on the profile db. But when we clsoe them, we did it in the same order, which could potentially cause a deadlock. Now we close them in the reverse order; the profile db first, then the contacts db. - Remove mActiveDb. This wasn't set in switchTo{Profile,Contact}Mode(), but was lazily initialized. But I wasn't too sure if I always set the right db at the right timing. Looks like I forgot to do so in a few cases. Let's just remove it and always explicitly get the database from the current db helper. Bug 6250673 Change-Id: Idd18fc173596c973d0ff8b6e1b2456715c0f14f8
* | | am 4c3a0457: Support new query parameters introduced in Iaab5c38aMakoto Onuki2012-06-181-31/+44
|\ \ \ | |/ / | | | | | | | | | * commit '4c3a04572ead6ad9f0cfc20a34db3252fdb31201': Support new query parameters introduced in Iaab5c38a
| * | Support new query parameters introduced in Iaab5c38aMakoto Onuki2012-06-151-31/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | The new query parameters controls which field hone.CONTENT_FILTER_URI should search. Bug 6662259 Change-Id: I6f4cb4439dc4414cb96cf6a9fc66d0758ddf9faa
* | | am a499a2ad: Merge "Fix aggregation exception problem"Makoto Onuki2012-06-131-0/+4
|\ \ \ | |/ / |/| / | |/ | | * commit 'a499a2adb856223de65d298cd93d70c85afe3d4d': Fix aggregation exception problem
| * Fix aggregation exception problemTomas Mandorf2012-06-081-0/+4
| | | | | | | | | | | | | | | | This patch fixes a bug in the aggregation algorithm. When adding aggregation exceptions sometimes when excluding a raw contact from a Contact the contact information was not updated. Change-Id: If527c0fe0bd51eec77a71e466492691375889037
* | Don't wait for read access latch in provider.getType()Makoto Onuki2012-05-141-3/+4
| | | | | | | | | | | | | | | | until really necessary. Bug 6434853 Change-Id: I8f1d898f866b3b8016d720b80f8ffb8caac5048b
* | Move CancellationSignal to android.os package.Jeff Brown2012-05-072-2/+2
| | | | | | | | | | Bug: 6427830 Change-Id: I9e856990512253fe2ca4cc2079d195a7fa991151
* | Merge "Remove never used SocialProvider and activity table" into jb-devMakoto Onuki2012-05-042-456/+8
|\ \
| * | Remove never used SocialProvider and activity tableMakoto Onuki2012-05-032-456/+8
| | | | | | | | | | | | | | | | | | Bug 6148750 Change-Id: If63219745973aa2629b95259ec692867f5197e79
* | | More detailed verbose log from contacts providerMakoto Onuki2012-05-031-4/+10
|/ / | | | | | | Change-Id: I4723c245d4dd93b130552e8257045c0419e0dc6b
* | Merge "Don't show the invisible in frequent" into jb-devMakoto Onuki2012-05-011-6/+9
|\ \
| * | Don't show the invisible in frequentMakoto Onuki2012-04-301-6/+9
| | | | | | | | | | | | | | | | | | Bug 6000492 Change-Id: I5959cad0e3c04476a1b133508c60cdb8037b16f7
* | | Make names with special chars searchable.Makoto Onuki2012-04-302-38/+63
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | It's a better fix than I34bfa864, which was only a quick workaround for double barrelled names. Now names with other special characters are searchable too. Also, previously, a query "doublebarrelled" wouldn't match "double-barrelled", but now it will. Bug 5592553 Change-Id: Id1d44261f577df7abf701311ed1c86fb093547da
* | Merge "Don't suggest invisible for aggregation" into jb-devMakoto Onuki2012-04-261-2/+3
|\ \
| * | Don't suggest invisible for aggregationMakoto Onuki2012-04-251-2/+3
| | | | | | | | | | | | | | | | | | Bug 6400450 Change-Id: I4b5ed4a331f6740c3954b232633076e60e1de140
* | | Clean up Phone.NORMALIZED_NUMBERS upgraded from GBMakoto Onuki2012-04-251-1/+83
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If upgraded from GB, the NORMALIZED_NUMBERS column doesn't really contain the "normalized" numbers. It's some kind of stripped-out-and-reversed numbers. We can't create normalized numbers for them as we don't really know the correct country for each number (and we can't even rely on CountryDetector during the upgrade step -- the detector isn't ready at this moment), so let's just null out those bad numbers. This is how we do for invalid numbers. phone_lookup.NORMALIZED_NUMBERS also has the same issue, so let's recreate them in the way DataRowHandlerForPhoneNumber.insert() would when it can't infar the normalized number. (i.e. when the phone number is invalid.) Bug 5690851 Change-Id: I756b828e15a50a2f711c01ef22abd2cfa67bad0a
* | Merge "New aggregation logic"Makoto Onuki2012-04-237-132/+418
|\ \
| * | New aggregation logicMakoto Onuki2012-04-207-132/+418
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now a raw contact can be merged into a contact containing raw contacts from the same account if there's at least one raw contact in those raw contacts that shares at least one email address, phone number, or identity. Now the aggregation logic version is 3. Also: - Make sure changes to the identity triggers aggregation. - Stop re-using some HashMaps/HashSets, as they don't shirink the internal table when clear()ed. During the aggregation update we may put a bunch of stuff into those, and we want to make sure that we don't keep unnecessarily bit internal tables after the upgrade. This should be okay with the modern dalvik GC. Change-Id: I855085d334679363cf9bffb918ca2ceb0cfe77f5
* | | Use 3 bucket sorting logic for frequent.Makoto Onuki2012-04-181-41/+37
| | | | | | | | | | | | | | | | | | Bug 6343819 Change-Id: Id2a2827fca611e62a5a1406faa73026625feaede
* | | Fix the last failing photo testMakoto Onuki2012-04-162-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add some nice features to the asserts for complex data. - assertImageRawData() now writes the expected and actual images to the cache dir when failing. - assertStoredValues() and its siblings now dump the cursor to logcat when failing. Bug 6280711 Change-Id: I77aff61b0494580d0b2ba24b35eb045a18cd48c8
* | | Upgrade step to fill raw_contacts.last_time_contacted.Makoto Onuki2012-04-141-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace raw_contacts.last_time_contacted with data_usage_stat.last_time_used if it's bigger. Bug 6326418 Change-Id: I052a7fb92e69cf35f8e37a9be1b074f480e96071
* | | Fix and simplify data usage feedbackMakoto Onuki2012-04-142-84/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now it correctly updates both raw_contacts and contacts too, with fewer sqls and less memory. Bug 6326418 Change-Id: I89f0f92bae5bad5505b218eca2a29ae56b51fe7f
* | | Use new URI for deleting usage statsMakoto Onuki2012-04-131-7/+7
| | | | | | | | | | | | | | | | | | Bug 5475575 Change-Id: I11894ef80727e2dc22e73330a5afca41c189135b
* | | Merge "New API to clear usage stats"Makoto Onuki2012-04-131-0/+21
|\ \ \
| * | | New API to clear usage statsMakoto Onuki2012-04-121-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolver.delete(DataUsageFeedback.FEEDBACK_URI, null, null); Bug 5475575 Change-Id: I20adaea0350e95a8f8526507ddc1b2bdc8e8fe13
* | | | Merge "Fix most of photo tests"Makoto Onuki2012-04-123-34/+35
|\ \ \ \
| * | | | Fix most of photo testsMakoto Onuki2012-04-123-34/+35
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjusting existing unit tests for higher res photos turned out to be tricky, because the size of the test images were selected for 256x256. (e.g. cropping tests) Also we don't want the display photo size to change depending on the running device. So let's just keep using 256x256 for all unit tests. Added new asserts to EvenMoreAssert to compare image raw data, which prints actual/expected dimensions when it fails. Even with this CL, ContactsProvider2Test.testInputStreamForPhoto() still fails with the following assert message. The image size seems to be correct, so I'm not sure why. This may be because we've changed the compression rate, but I didn't dig into it. "Different data lengths: expected=1088 actual=1578, expected dimentions=[96 x 96] actual dimentions=[96 x 96]" Anyway, with this CL at least PhotoStoreTest will no longer crash, so let's merge it now and take care of the failing test later. Change-Id: I935f76acee3c2de99030c62e14f43de07074fb8a
* | | | Fix " Cannot bind argument at index 1..." crashMakoto Onuki2012-04-121-4/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Even when the specified account doesn't exist, we can't just replace the entire selection with (1=2), because the orignal selection may have query parameters. Let's just append "AND (1=2)" to the original query instead. Bug 6295580 Change-Id: Ida13f17fe645329b1b1d5de76252abfb0fcbe282
* | | Merge "Dont show invisible contacts in frequent."Makoto Onuki2012-04-111-3/+8
|\ \ \
| * | | Dont show invisible contacts in frequent.Makoto Onuki2012-04-111-3/+8
| |/ / | | | | | | | | | | | | | | | Bug 6000492 Change-Id: I0e316f294feca805038611e0449fddcbda0b2deb
* | | System prop to keep stale account dataMakoto Onuki2012-04-111-0/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | If set to 1 (adb shell setprop debug.contacts.ksad 1) the provider won't remvoe any data when accounts are removed. This should be used sparingly; even though there are data still available, the UI don't know anything about them, so they won't show up in the contact filter screen, and the contact card/editor may get confused to see unknown custom mimetypes. Change-Id: Id036d7e0dd68b84bba953690a74648b25cf090b8
* | Merge "Allow access to the NORMALIZED_NUMBER, so that sync adapters can sync it"Daniel Lehmann2012-04-061-27/+30
|\ \
| * | Allow access to the NORMALIZED_NUMBER, so that sync adapters can sync itDaniel Lehmann2012-03-091-27/+30
| | | | | | | | | | | | | | | | | | Bug:6126736 Change-Id: Ia1c83c4c600e44f3a354aec7e206267341143ef4
* | | Addressed comments about previous CLDaniel Lehmann2012-04-021-5/+17
| | | | | | | | | | | | | | | Bug:6202229 Change-Id: I8905f92bcea99848969a446b83d90c7cd077e547
* | | Increase the photo size to 480x480 or 720x720, depending on deviceDaniel Lehmann2012-04-025-21/+125
| | | | | | | | | | | | | | | | | | Bug:6202229 Change-Id: I98b38023585d154eccad302578f796a2318fd5b2
* | | Clear in-memory caches when rolling back transactionMakoto Onuki2012-03-283-7/+20
| | | | | | | | | | | | | | | | | | Bug 6245089 Change-Id: I4fe92fbf190090b6e25a411c8c0e2f9885564952
* | | Merge "Revert ""Rollback" mimetype cache""Makoto Onuki2012-03-283-51/+4
|\ \ \
| * | | Revert ""Rollback" mimetype cache"Makoto Onuki2012-03-283-51/+4
| | | | | | | | | | | | | | | | | | | | This reverts commit c624ff13d5df4848a6ec605e25ea8469dd677d5d Due to b/6123232
* | | | Merge ""Rollback" mimetype cache"Makoto Onuki2012-03-273-4/+51
|\ \ \ \ | |/ / /
| * | | "Rollback" mimetype cacheMakoto Onuki2012-03-273-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | Bug 6239243 Change-Id: Icf473e5178a76fda66b33fc11875f00d87b36c16
* | | | Merge "Don't upsize non-square pictures, even when cropping"Daniel Lehmann2012-03-271-2/+2
|\ \ \ \