summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | 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
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3ad4f2e7: Merge "Revert metadata_sync table and related code from M" into ↵Zheng Fu2015-06-116-1063/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '3ad4f2e72b677e3f7936af17f831bf6cdd95aa69': Revert metadata_sync table and related code from M
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 039259f7: Merge "Roll out new aggregator to limited dogfooders." into mnc-devZheng Fu2015-06-092-1/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '039259f7a3fa9cb11e891c878728b6cc0bc80f25': Roll out new aggregator to limited dogfooders.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6c3380a5: Merge "ContactsProvider does not use cleartext network ↵Alex Klyubin2015-06-091-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | traffic." into mnc-dev * commit '6c3380a5e5d5ce112f4ea5991b1f7136d51e5ce7': ContactsProvider does not use cleartext network traffic.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2139c6a3: Merge "Set Calls.NEW to 0 if the voicemail is read." into mnc-devNancy Chen2015-06-081-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2139c6a3d6d9e00ff03c3278ee3b84211d96b247': Set Calls.NEW to 0 if the voicemail is read.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1440fb9d: Actually make CARRIER_PRESENCE accessibleMakoto Onuki2015-06-083-1/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1440fb9d8e4edefb57336532734f7cbab13a955f': Actually make CARRIER_PRESENCE accessible
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 47fc56dd: Fix broken CP2 unit tests and voicemail cleanupYorke Lee2015-06-047-83/+80
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '47fc56dd40613fae565d0c4d630f5f0b5fc310ff': Fix broken CP2 unit tests and voicemail cleanup
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cabd7cf8: Fix NPE in enterprise API & fix unit tests.Makoto Onuki2015-06-043-4/+150
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cabd7cf832f5b160c30bff9c7b975bbf21a95d8e': Fix NPE in enterprise API & fix unit tests.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e9b0be19: Update CP2 unit tests for changed permissionsBrian Attwell2015-06-032-67/+47
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e9b0be19881605e5d23404c95d2da357ab0879b9': Update CP2 unit tests for changed permissions
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 650887fa: Merge "Performance tuning for contact aggregator2" into mnc-devZheng Fu2015-06-037-141/+201
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '650887faeb54b6c67c6628ea0b6da5554c58827c': Performance tuning for contact aggregator2
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 95f4fd8b: Decouple ProviderStatus & internal provider stateBrian Attwell2015-06-023-20/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '95f4fd8bf381ed9319f139febc369ce70dcb022e': Decouple ProviderStatus & internal provider state
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d67c70c5: Merge "Fix enterprise path permission checking" into mnc-devRicky Wai2015-06-011-6/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd67c70c551749929f2fa845279b554132bf992f0': Fix enterprise path permission checking
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7be0aed6: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-300-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7be0aed6285b91f66a7216c57732908c2e126d2a': Import translations. DO NOT MERGE
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContactsProvider : Hard code group resource idsDanesh M2016-03-111-0/+20
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group names for the current locale are fetched via resource ids that are persisted in the database. Resource ids can easily change as they are incrementally generated. Resolve this by hard coding the resource id. CYNGNOS-2174 Change-Id: If876acb604a44721e8930f7e1d1efd6e752d3d46
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic translation importMichael Bestas2016-03-0513-0/+435
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b85607c46552f8b7c00200a144e37494a102b3e
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't suspend aggregation for new contactsGabriele M2016-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New contacts are not merged with existing contacts until they are edited. Set the default aggregation mode to AGGREGATION_MODE_DEFAULT to have them merged right away. Change-Id: I18a5d32ca01daa2abc913843a094a82823cf61c3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic translation importMichael Bestas2015-12-254-0/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I98332742fc7f1001156472e3d56771e96792f14b
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a richer system around preloading contactsRohit Yengisetty2015-12-146-0/+342
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2c3b6b79ee41eb73948f9a053454654ee8566a12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-072-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/providers/ContactsProvider into HEAD Android 6.0.1 release 3