summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | am 8da96d94: am 07b5ddba: Fix CallLogProviderTest.testAddCallYorke Lee2015-08-031-3/+4
| | | |\ \ \ \ \
| | * | \ \ \ \ \ am 657beb09: am f40e1d68: am 63a78131: Don\'t show aggregation suggestions fo...Zheng Fu2015-07-301-23/+24
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am f40e1d68: am 63a78131: Don\'t show aggregation suggestions for contacts it...Zheng Fu2015-07-301-23/+24
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ am 5a47ebdd: am ed6a10c2: am b049fb09: Default contact aggregator to ContactA...Zheng Fu2015-07-271-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am ed6a10c2: am b049fb09: Default contact aggregator to ContactAggregator2.Zheng Fu2015-07-271-1/+1
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ am 12c4b02b: (-s ours) am 818b47a9: (-s ours) am 4477e6d5: (-s ours) Import t...Geoff Mendal2015-07-240-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am 818b47a9: (-s ours) am 4477e6d5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-240-0/+0
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ am 4f1e51fe: am 8879cc75: am e5bd832d: Fix failing tests due to logic changes...Zheng Fu2015-07-184-12/+31
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am 8879cc75: am e5bd832d: Fix failing tests due to logic changes in the new a...Zheng Fu2015-07-184-12/+31
| | | |\ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ am 72445532: am 0dc8027b: am f3d2981b: Should update aggregate data after mar...Zheng Fu2015-07-171-10/+9
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am 0dc8027b: am f3d2981b: Should update aggregate data after marking raw cont...Zheng Fu2015-07-171-10/+9
| | | |\ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ am a99fa8a5: am 8a079b92: am 8d4e5229: Merge "Performance turning for aggrega...Zheng Fu2015-07-163-88/+176
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | am 8a079b92: am 8d4e5229: Merge "Performance turning for aggregator 1. Move i...Zheng Fu2015-07-153-88/+176
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ am 7e89ca37: am 8389c727: am 37a30e36: Merge "Remove extra logging with priva...Chenjie Luo2015-07-151-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | am 8389c727: am 37a30e36: Merge "Remove extra logging with privacy info" into...Chenjie Luo2015-07-151-2/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ am 9ca3d9ce: am 99ccd51b: (-s ours) Remove extra logging with privacy info DO...Chenjie Luo2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | am 99ccd51b: (-s ours) Remove extra logging with privacy info DO NOT MERGEChenjie Luo2015-07-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Remove extra logging with privacy info DO NOT MERGEChenjie Luo2015-07-151-2/+1
| | * | | | | | | | | | | | | | | am cb469c24: (-s ours) am 3225addc: (-s ours) am 9e5af63c: (-s ours) Import t...Geoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | am 3225addc: (-s ours) am 9e5af63c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ee3253ca: am 43f9a00c: am cc9ce6b1: Dealing with some edge cases with soft...Zheng Fu2015-07-143-6/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | am 43f9a00c: am cc9ce6b1: Dealing with some edge cases with soft deleted cont...Zheng Fu2015-07-133-6/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 727924f9: (-s ours) am 902dc418: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | am 902dc418: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5ca831dc: Fix bug in aggregation suggestions in new contacts aggregator.Zheng Fu2015-07-082-5/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | am 1d48d5a9: Copy ringtone uri when rewriting cursor from corp profile.Sudheer Shanka2015-07-011-1/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 41f8def2: Merge "Fix read voicemails being marked as "new"." into mnc-devNancy Chen2015-06-232-1/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c8ceb951: Merge "Remove read/write social stream permissions" into mnc-devSvet Ganov2015-06-231-41/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e090212b: Always atomically drop & create search index.Makoto Onuki2015-06-231-6/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 71f0747e: Fix upgrade stepsMakoto Onuki2015-06-221-3/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 876a6a92: code refactor in ContactAggregatorHelperZheng Fu2015-06-201-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3edc78c7: Guard against directory provider crashMakoto Onuki2015-06-161-10/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3ad4f2e7: Merge "Revert metadata_sync table and related code from M" into ...Zheng Fu2015-06-116-1063/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 039259f7: Merge "Roll out new aggregator to limited dogfooders." into mnc-devZheng Fu2015-06-092-1/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6c3380a5: Merge "ContactsProvider does not use cleartext network traffic."...Alex Klyubin2015-06-091-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2139c6a3: Merge "Set Calls.NEW to 0 if the voicemail is read." into mnc-devNancy Chen2015-06-081-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1440fb9d: Actually make CARRIER_PRESENCE accessibleMakoto Onuki2015-06-083-1/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 47fc56dd: Fix broken CP2 unit tests and voicemail cleanupYorke Lee2015-06-047-83/+80
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cabd7cf8: Fix NPE in enterprise API & fix unit tests.Makoto Onuki2015-06-043-4/+150
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e9b0be19: Update CP2 unit tests for changed permissionsBrian Attwell2015-06-032-67/+47
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 650887fa: Merge "Performance tuning for contact aggregator2" into mnc-devZheng Fu2015-06-037-141/+201
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 95f4fd8b: Decouple ProviderStatus & internal provider stateBrian Attwell2015-06-023-20/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d67c70c5: Merge "Fix enterprise path permission checking" into mnc-devRicky Wai2015-06-011-6/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7be0aed6: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-300-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContactsProvider : Hard code group resource idsDanesh M2016-03-111-0/+20
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic translation importMichael Bestas2016-03-0513-0/+435
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't suspend aggregation for new contactsGabriele M2016-02-281-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic translation importMichael Bestas2015-12-254-0/+130
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a richer system around preloading contactsRohit Yengisetty2015-12-146-0/+342
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/pac...Steve Kondik2015-12-072-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |