summaryrefslogtreecommitdiffstats
path: root/src/com/android/providers/contacts/aggregation
Commit message (Collapse)AuthorAgeFilesLines
* Remove default settings during contacts aggregation.Zheng Fu2014-09-101-0/+53
| | | | | | | | Set is_super_primary to 0 for all the shared mime-types's data between aggregated contacts. Bug:5080996 Change-Id: Ie65259c11d719b343f234e5fccf883491e7992a7
* Fix broken aggregation behavior for pinned contacts and testsYorke Lee2014-07-301-4/+9
| | | | | | | | | | Update the value of some pre-defined constants in tests Make sure that aggregation correctly sets pinned positions for aggregated contacts - the lowest pinned position of all constituent raw contacts, and 0 if none of them are pinned. Bug: 16628573 Change-Id: I3e072baf7ff933a6eef861ed394f3fc817aee48b
* Handle DEMOTE and UNDEMOTE in CP2Yorke Lee2013-08-051-4/+6
| | | | | | | | | | | * If a contact is UNDEMOTED, if it was previously DEMOTED, it will become UNPINNED. Otherwise, it will remain unchanged. * When two raw contacts are aggregated, the parent contact should inherit the lower pinned position of the two, not including negative integers. Change-Id: I74f41dfa327b8e5a79688b1e99eafbef7d9d58a0
* Add pinning support in ContactsProviderYorke Lee2013-07-241-11/+59
| | | | Change-Id: I3c835c2fd0faf99f8fb176752cfcb12e011095a2
* Adding contacts delta api.Chiao Cheng2013-04-081-11/+14
| | | | | | | | | | Updates and inserts can be detected through the use of a new timestamp field in the contacts table. Deletes can be detected by querying the new deleted_contacts table. Bug: 8182147 Change-Id: I5c1e596f4e1aa58528afc29396f79cb4051e229c
* am d109b237: am ff91ec35: Tolerate crashes during re-aggregation.Makoto Onuki2012-07-201-2/+13
|\ | | | | | | | | * commit 'd109b23736e4171d23356642bd5dbe28743341da': Tolerate crashes during re-aggregation.
| * am ff91ec35: Tolerate crashes during re-aggregation.Makoto Onuki2012-07-191-2/+13
| |\ | | | | | | | | | | | | * commit 'ff91ec356f1b17dea095a880f61b8bc4ff333b1e': Tolerate crashes during re-aggregation.
| | * Tolerate crashes during re-aggregation.Makoto Onuki2012-07-181-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Reorganize import in contacts providerMakoto Onuki2012-06-273-27/+27
|/ / | | | | | | Change-Id: If3afb134ea36bd93859efcd114885526e1592b91
* | am a499a2ad: Merge "Fix aggregation exception problem"Makoto Onuki2012-06-131-0/+4
|/ | | | | * commit 'a499a2adb856223de65d298cd93d70c85afe3d4d': Fix aggregation exception problem
* Don't suggest invisible for aggregationMakoto Onuki2012-04-251-2/+3
| | | | | | Bug 6400450 Change-Id: I4b5ed4a331f6740c3954b232633076e60e1de140
* Merge "New aggregation logic"Makoto Onuki2012-04-232-56/+244
|\
| * New aggregation logicMakoto Onuki2012-04-202-56/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fix most of photo testsMakoto Onuki2012-04-121-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Add new package aggregation.utilMakoto Onuki2012-03-235-4/+765
| | | | | | Move aggregator related classes into it. Change-Id: I712fe07ad2bab1e532e3822e3e2797a199329865
* Move aggregator to its own packageMakoto Onuki2012-03-052-0/+2398
... so that methods used only by ProfileAggregator don't have to be public. And fix some method visibilities that don't make sense. Needed to change the bogus ID in PhotoStoreTest; otherwise moving the aggregator test will make this test fail for some unclear reason. Bug 6118852 Change-Id: Ic0c022cbf50128f40c70559c1a7cf8e2a6c06fc8
generated by cgit v1.1 at 2025-01-11 01:44:59 +0000