summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Query skype mime type when getting CALLABLE contacts"HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004replicant-6.0Denis 'GNUtoo' Carikli2020-12-031-6/+2
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 01c7baf0157231d9231853ea812d97646c779e5b. In the patch set to remove the Ambient SDK, belgin gave me the following commit has to use in this repository: edec4c11c704e9908f1d4f915a4ec2e0eefe54fe edec4c11 Automatic translation import However the commit right before the introduction of the Ambient SDK is the one being reverted: 01c7baf0157231d9231853ea812d97646c779e5b 01c7baf0 Query skype mime type when getting CALLABLE contacts As Skype is not free software and that this commit explains clearly that it contains skype specific parts ("TODO: pass in mime type so that this is not skype specific") and that the Ambient SDK was probably tested by Belgin without this commit, it's safe to revert it. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
* Query skype mime type when getting CALLABLE contactscm-13-before-ambientsdkemancebo2016-04-071-2/+6
| | | | | | TODO: pass in mime type so that this is not skype specific Change-Id: I37dd1119bea41e2c544b18773b134de41105da2e
* Automatic translation importMichael Bestas2016-04-061-0/+39
| | | | Change-Id: Ib69987b18c0fe1af4ce9c70d1a26fde690b43485
* Automatic translation importMichael Bestas2016-03-282-0/+78
| | | | Change-Id: I1e70719a49f605574c17167156cdc9a2dd92b875
* update addCall to account for extra paramterIan Roy2016-03-221-1/+1
| | | | | | caused by this: http://review.cyanogenmod.org/#/c/134250 Change-Id: I93e3691da1f5a8655ce04d0bdedeadbbdbb8bc8d
* [4/4] Add column for storing origin in CallLogStephen Bird2016-03-182-2/+21
| | | | | | | | We use this origin column to determine which parts of the application/os are used to make calls most often. Ticket: CD-517 Change-Id: I254a4731e7618b6dd523bf6ba567d2a5dffd3c01
* Merge branch 'dr15' into cm-13.0Steve Kondik2016-03-1210-46/+15
|\
| * Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-1010-46/+15
| |\ | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/providers/ContactsProvider into cm-13.0 Android 6.0.1 release 22
| | * Update directories when initializing ContactsProvider.Tingting Wang2015-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is to fix a bug when reading exchange provider. Updating directories can fix it without factory reset or account changed. BUG 22398175 Change-Id: I36e05ff5f7bc83dc25ab165e5f5fb122bbe6c160
| | * Add READ/WRITE_CONTACTS permissions to ContactsProvider am: ade78bd70aYorke Lee2015-10-241-0/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | am: 9658b87006 * commit '9658b870066c74caffc0e3517a105b16ed001660': Add READ/WRITE_CONTACTS permissions to ContactsProvider
| | | * Add READ/WRITE_CONTACTS permissions to ContactsProviderYorke Lee2015-10-241-0/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ade78bd70a * commit 'ade78bd70affa0d5963a998152646f55dfe24bf5': Add READ/WRITE_CONTACTS permissions to ContactsProvider
| | * | | am 1da0bdf7: am b50aef55: Update calllogbackup\'s new package name.Santos Cordon2015-10-141-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '1da0bdf7cd672abce5a99bd70cb8899eb27c69c1': Update calllogbackup's new package name.
| | | * | am b50aef55: Update calllogbackup\'s new package name.Santos Cordon2015-10-141-2/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b50aef5535403ca212f5785529e4b2f1709fe107': Update calllogbackup's new package name.
| | * | | | am 68a179cd: (-s ours) am c9f90deb: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '68a179cd970fea0f9c15a80bb46f1f3e052b371e': Import translations. DO NOT MERGE
| | | * | | am c9f90deb: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c9f90deb47fd289851615e92a51bee233d30bbd8': Import translations. DO NOT MERGE
| | * | | | | am de10e36c: (-s ours) am 03b9ce57: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'de10e36c747503c6d43b1a95f60aa4f2bcc10541': Import translations. DO NOT MERGE
| | | * | | | am 03b9ce57: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '03b9ce57b263417b031f34305c1d0f355d8fa0cb': Import translations. DO NOT MERGE
| | * | | | | | am 27174a97: am 8da96d94: am 07b5ddba: Fix CallLogProviderTest.testAddCallYorke Lee2015-08-031-3/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '27174a97d74b203bd5612d8f74e2a2d45f1bacf0': Fix CallLogProviderTest.testAddCall
| | | * | | | | am 8da96d94: am 07b5ddba: Fix CallLogProviderTest.testAddCallYorke Lee2015-08-031-3/+4
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8da96d94f172985bf8c40ace6568b4d9a0a42b50': Fix CallLogProviderTest.testAddCall
| | * | | | | | | am 657beb09: am f40e1d68: am 63a78131: Don\'t show aggregation suggestions ↵Zheng Fu2015-07-301-23/+24
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for contacts itself. * commit '657beb09e926322adc3774eee47c84fee6be9c11': Don't show aggregation suggestions for contacts itself.
| | | * | | | | | am f40e1d68: am 63a78131: Don\'t show aggregation suggestions for contacts ↵Zheng Fu2015-07-301-23/+24
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | itself. * commit 'f40e1d68eac8359c371a953a8cd144f21f67cfff': Don't show aggregation suggestions for contacts itself.
| | * | | | | | | | am 5a47ebdd: am ed6a10c2: am b049fb09: Default contact aggregator to ↵Zheng Fu2015-07-271-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContactAggregator2. * commit '5a47ebdd14cc867da587e4a5a4f3ac923fbc9b57': Default contact aggregator to ContactAggregator2.
| | | * | | | | | | am ed6a10c2: am b049fb09: Default contact aggregator to ContactAggregator2.Zheng Fu2015-07-271-1/+1
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ed6a10c23e3aae158e57154a72991180fec263f3': Default contact aggregator to ContactAggregator2.
| | * | | | | | | | | am 12c4b02b: (-s ours) am 818b47a9: (-s ours) am 4477e6d5: (-s ours) Import ↵Geoff Mendal2015-07-240-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '12c4b02b36ce9d92b868ec2e92038730fe096999': Import translations. DO NOT MERGE
| | | * | | | | | | | am 818b47a9: (-s ours) am 4477e6d5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-240-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '818b47a916ad2d170c350fe5bf533365b7d9eb5f': Import translations. DO NOT MERGE
| | * | | | | | | | | | am 4f1e51fe: am 8879cc75: am e5bd832d: Fix failing tests due to logic ↵Zheng Fu2015-07-184-12/+31
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes in the new aggregator. * commit '4f1e51fe2b0c8236ec71f5adfc10513b2a8e36b7': Fix failing tests due to logic changes in the new aggregator.
| | | * | | | | | | | | am 8879cc75: am e5bd832d: Fix failing tests due to logic changes in the new ↵Zheng Fu2015-07-184-12/+31
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aggregator. * commit '8879cc753ec8a9003e896c0f86fdeeefa705ca9e': Fix failing tests due to logic changes in the new aggregator.
| | * | | | | | | | | | | am 72445532: am 0dc8027b: am f3d2981b: Should update aggregate data after ↵Zheng Fu2015-07-171-10/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | marking raw contact deleted. * commit '724455322098713441c3e923166e54e3f4186d8e': Should update aggregate data after marking raw contact deleted.
| | | * | | | | | | | | | am 0dc8027b: am f3d2981b: Should update aggregate data after marking raw ↵Zheng Fu2015-07-171-10/+9
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contact deleted. * commit '0dc8027bc70dc24c411d875a60781d44a0cfcf34': Should update aggregate data after marking raw contact deleted.
| | * | | | | | | | | | | | am a99fa8a5: am 8a079b92: am 8d4e5229: Merge "Performance turning for ↵Zheng Fu2015-07-163-88/+176
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aggregator 1. Move identification matching to secondary 2. In the first stage, do secondary matching only if there is no structured name 3. Aggregate all the raw contacts without structured name if * commit 'a99fa8a5bf4d6db9da5fae2f09245a4dcec73645': Performance turning for aggregator 1. Move identification matching to secondary 2. In the first stage, do secondary matching only if there is no structured name 3. Aggregate all the raw contacts without structured name if they have matching secondary data 4. Remove approximate name matching in aggregator. (This will not impact the name variant, such as John and Johathan matching)
| | | * | | | | | | | | | | am 8a079b92: am 8d4e5229: Merge "Performance turning for aggregator 1. Move ↵Zheng Fu2015-07-153-88/+176
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | identification matching to secondary 2. In the first stage, do secondary matching only if there is no structured name 3. Aggregate all the raw contacts without structured name if they have mat * commit '8a079b92788f590485203921a5c9be002823487b': Performance turning for aggregator 1. Move identification matching to secondary 2. In the first stage, do secondary matching only if there is no structured name 3. Aggregate all the raw contacts without structured name if they have matching secondary data 4. Remove approximate name matching in aggregator. (This will not impact the name variant, such as John and Johathan matching)
| | * | | | | | | | | | | | | am 7e89ca37: am 8389c727: am 37a30e36: Merge "Remove extra logging with ↵Chenjie Luo2015-07-151-2/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | privacy info" into mnc-dev * commit '7e89ca3769f7999c20144f78a0eb212f5596b9e8': Remove extra logging with privacy info
| | | * | | | | | | | | | | | am 8389c727: am 37a30e36: Merge "Remove extra logging with privacy info" ↵Chenjie Luo2015-07-151-2/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '8389c727dfb1c960f41b803366e901dcae501561': Remove extra logging with privacy info
| | * | | | | | | | | | | | | | am 9ca3d9ce: am 99ccd51b: (-s ours) Remove extra logging with privacy info ↵Chenjie Luo2015-07-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit '9ca3d9cea14de550ad87b7bc42ac6ec48946de93': Remove extra logging with privacy info DO NOT MERGE
| | | * | | | | | | | | | | | | am 99ccd51b: (-s ours) Remove extra logging with privacy info DO NOT MERGEChenjie Luo2015-07-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '99ccd51b515bf6036aa339f12aab8aa5241b9fbe': Remove extra logging with privacy info DO NOT MERGE
| | | | * | | | | | | | | | | | | Remove extra logging with privacy info DO NOT MERGEChenjie Luo2015-07-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22075764, 22379601 Change-Id: I05a27684641083fa3ce172d4ffa6b5ff0718af19 (cherry picked from commit 39867c22b1335d866d21a2c5c3b3e5123045d550)
| | * | | | | | | | | | | | | | | am cb469c24: (-s ours) am 3225addc: (-s ours) am 9e5af63c: (-s ours) Import ↵Geoff Mendal2015-07-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'cb469c247cf1f82bc4b11faea98705d1d8c8fe87': Import translations. DO NOT MERGE
| | | * | | | | | | | | | | | | | am 3225addc: (-s ours) am 9e5af63c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3225addcb289426f54eee6dba03551b6932032c2': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | am ee3253ca: am 43f9a00c: am cc9ce6b1: Dealing with some edge cases with ↵Zheng Fu2015-07-143-6/+11
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | soft deleted contacts. 1. Exlude soft deleted contacts for aggregator algorithm upgrade. 2. Make sure to update the contacts.name_raw_contact_id column for soft deleted raw contact. * commit 'ee3253caf8b9800a32186b78f980a9ede85dcab9': Dealing with some edge cases with soft deleted contacts. 1. Exlude soft deleted contacts for aggregator algorithm upgrade. 2. Make sure to update the contacts.name_raw_contact_id column for soft deleted raw contact.
| | | * | | | | | | | | | | | | | | am 43f9a00c: am cc9ce6b1: Dealing with some edge cases with soft deleted ↵Zheng Fu2015-07-133-6/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contacts. 1. Exlude soft deleted contacts for aggregator algorithm upgrade. 2. Make sure to update the contacts.name_raw_contact_id column for soft deleted raw contact. * commit '43f9a00c792966e0f875179163499bb984a86cf1': Dealing with some edge cases with soft deleted contacts. 1. Exlude soft deleted contacts for aggregator algorithm upgrade. 2. Make sure to update the contacts.name_raw_contact_id column for soft deleted raw contact.
| | * | | | | | | | | | | | | | | | | am 727924f9: (-s ours) am 902dc418: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '727924f9956e725310295e2375ed1d3aed54adda': Import translations. DO NOT MERGE
| | | * | | | | | | | | | | | | | | | am 902dc418: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '902dc418e1a3e9666a44b277449b4fc0ac546754': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | | am 5ca831dc: Fix bug in aggregation suggestions in new contacts aggregator.Zheng Fu2015-07-082-5/+20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5ca831dc33dfa16821647e14e377c484df823c80': Fix bug in aggregation suggestions in new contacts aggregator.
| | * | | | | | | | | | | | | | | | | | am 1d48d5a9: Copy ringtone uri when rewriting cursor from corp profile.Sudheer Shanka2015-07-011-1/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1d48d5a992c32d37bc9535686d96569680639cfa': Copy ringtone uri when rewriting cursor from corp profile.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 41f8def2: Merge "Fix read voicemails being marked as "new"." into mnc-devNancy Chen2015-06-232-1/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '41f8def240346c6e65af7f31fce2628d802dd880': Fix read voicemails being marked as "new".
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c8ceb951: Merge "Remove read/write social stream permissions" into mnc-devSvet Ganov2015-06-231-41/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8ceb95134cfc2cd67454343c3235dbbf6b97b48': Remove read/write social stream permissions
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e090212b: Always atomically drop & create search index.Makoto Onuki2015-06-231-6/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e090212bd2ff31a8f79a11e1e9b0980f7f6079fe': Always atomically drop & create search index.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 71f0747e: Fix upgrade stepsMakoto Onuki2015-06-221-3/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '71f0747e4126c41aa30a5ffc431b8c70b3458445': Fix upgrade steps
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 876a6a92: code refactor in ContactAggregatorHelperZheng Fu2015-06-201-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '876a6a921e532b6c1ca653e4c52c1819a75ff3be': code refactor in ContactAggregatorHelper
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3edc78c7: Guard against directory provider crashMakoto Onuki2015-06-161-10/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3edc78c78ba277b116c28fde9b8759cb18f03e1e': Guard against directory provider crash