aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-02-18Don't use queryContentProviders to avoid "transaction too large" exceptionandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-cts-releaseMakoto Onuki
Instead, use getInstalledPackages, which knows how to circumvent the binder transaction size limit. Bug 18261831 Change-Id: I2725af045c60a47bfce6eab966a5c745b6c17870
2015-02-04merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2015-02-03Merge "Additional change to IS_SUPER_PRIMARY" into lmp-mr1-devlollipop-mr1-devBrian Attwell
2015-02-03Additional change to IS_SUPER_PRIMARYBrian Attwell
UPDATE ----------------- This is being committed a second time, with two small changes from ag/619454: 1. This CL can be directly cherry-picked to MR1 because of the simpler unit test 2. Don't run a pointless update() call Original CL Comment ------------------ Noticed clearSuperPrimarySetting() sometimes clears all mimetypes's is_super_primary flag values sometimes, even mimetypes that aren't contained in both raw contacts. This doesn't appear to have been the intended behavior. Looks like a simple bug. Wrote a unit test and fixed the bug. Added a new method to DataUtil used inside the unit test. This method wasn't strictly necessary. But it is very useful in later CLs. (Part #2 or "Remove NAME_VERIFIED" series of CLs) Bug: 5080996 Bug: 18777272 Change-Id: I7944aae2ad4acb4df6560c5cd086242b7582fbf5
2015-01-27merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2015-01-23Fix cross profile caller id to use manager profiles userid.Kenny Guy
Cross profile caller id was checking myUserId when deciding whether to allow caller id from manged profiles where it should have used the managed profiles userid. Bug: 19122752 Change-Id: I230fc933655cd9464d00b619a383ff0682660c12
2014-12-10merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-12-09Merge "Skip aggregation if candidate contact contains too many raw contacts" ↵Zheng Fu
into lmp-mr1-dev
2014-12-09Skip aggregation if candidate contact contains too many raw contactsZheng Fu
This is likely an error or a shared corporate data element Bug:18641722 Change-Id: Icab78bcf621363a5b887095c043e2e1e3a2e1ca4
2014-12-09merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-12-05Fix package manager TransactionTooLargeExceptionJay Shrauner
Change resolvePhotoPriorityFromMetaData to use PackageManager.queryIntentServices to avoid grabbing too much data back. Bug:18607092 Change-Id: I32234d4906395b4940d28cc3661e49bb3de929e2
2014-11-18merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-11-17merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-11-13Modify the contact split logic to avoid over-split issue.Zheng Fu
Details If the best matching contact doesn't contain any raw contacts from the same account as the given raw contact, join them together if no identity mismatch between them on the same namespace, otherwise, keep them separate. If the best matching contact contains raw contacts from the same account as the given raw contact, join them together if they share at least one email address, phone number, or identity; otherwise, re-aggregate raw contact and all the raw contacts of best matching contact. When re-aggregation is needed, re-aggregate all the raw contacts (given raw contacts plus all the raw contacts of the best matching contact) based on the pair-wise connectivity. Two raw contacts are considered connected if they share at least one email address, phone number or identity. Bug:18304324 Change-Id: Ic5a27a23c2f64f534f7a7eaf5f3fb474e877c207
2014-11-13Make the email comparison case-insensitive for contact aggregation.Zheng Fu
Bug:18304324 Change-Id: If9e11022e392323b770c7560eba69617769ca080
2014-11-08merge in lmp-mr1-release history after reset to ↵The Android Automerger
77e675b050770c1bd68906c25859d7cdf8ea49db
2014-11-06merge in lmp-mr1-release history after reset to ↵The Android Automerger
77e675b050770c1bd68906c25859d7cdf8ea49db
2014-11-05merge in lmp-mr1-release history after reset to ↵The Android Automerger
77e675b050770c1bd68906c25859d7cdf8ea49db
2014-11-04merge in lmp-mr1-release history after reset to ↵The Android Automerger
77e675b050770c1bd68906c25859d7cdf8ea49db
2014-11-03merge in lmp-mr1-release history after reset to ↵The Android Automerger
77e675b050770c1bd68906c25859d7cdf8ea49db
2014-11-02merge in lmp-mr1-release history after reset to ↵The Android Automerger
77e675b050770c1bd68906c25859d7cdf8ea49db
2014-11-01merge in lmp-mr1-release history after reset to ↵The Android Automerger
77e675b050770c1bd68906c25859d7cdf8ea49db
2014-10-30Fix broken test in ContactsProvider2Test.javaZheng Fu
The test is broken due to the primary settings logic change in contact aggregator (ag/542398), i.e. default settings are removed during contacts aggregation. Bug:18118044 Change-Id: Ia4365c328d5a02367ba1842cecb9ff8cf08cfe3c
2014-10-30merge in lmp-mr1-release history after reset to ↵The Android Automerger
3a219cc3f5045bdebfcd975bf857c6ff26886a22
2014-10-29merge in lmp-mr1-release history after reset to ↵The Android Automerger
3a219cc3f5045bdebfcd975bf857c6ff26886a22
2014-10-28merge in lmp-mr1-release history after reset to ↵The Android Automerger
e1be52a71a0f92188a7c63e1b6bf762c68ef4b82
2014-10-27Sync call log entries to secondary user on background threadYorke Lee
Add code (similar to CP2) to offload tasks onto a background thread. This is a bit overkill for now but will be useful when we add stuff like call log syncing. Also add some new methods to MockUserManager needed to pass tests. Bug: 18056687 Change-Id: If51f64895d16029ecca1d1c46573324891e1d4d0
2014-10-27merge in lmp-mr1-release history after reset to ↵The Android Automerger
e1be52a71a0f92188a7c63e1b6bf762c68ef4b82
2014-10-26merge in lmp-mr1-release history after reset to ↵The Android Automerger
e1be52a71a0f92188a7c63e1b6bf762c68ef4b82
2014-10-25merge in lmp-mr1-release history after reset to ↵The Android Automerger
e1be52a71a0f92188a7c63e1b6bf762c68ef4b82
2014-10-23merge in lmp-mr1-release history after reset to ↵The Android Automerger
e1be52a71a0f92188a7c63e1b6bf762c68ef4b82
2014-10-22merge in lmp-mr1-release history after reset to ↵The Android Automerger
e1be52a71a0f92188a7c63e1b6bf762c68ef4b82
2014-10-21merge in lmp-mr1-release history after reset to ↵The Android Automerger
e1be52a71a0f92188a7c63e1b6bf762c68ef4b82
2014-10-20merge in lmp-mr1-release history after reset to ↵The Android Automerger
e1be52a71a0f92188a7c63e1b6bf762c68ef4b82
2014-10-19am 322b247d: (-s ours) am 1b02ce54: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '322b247d7fca67c35bbdf685c9f6b78d889f961c': Import translations. DO NOT MERGE
2014-10-19am 1b02ce54: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '1b02ce54d26449c8fe2ad760e039a9d8695b3038': Import translations. DO NOT MERGE
2014-10-19Import translations. DO NOT MERGElollipop-devBaligh Uddin
Change-Id: If4897471bbbe931bb4937061e104e6f06fc14650 Auto-generated-cl: translation import
2014-10-19merge in lmp-mr1-release history after reset to ↵The Android Automerger
876e356dd86d0fc2a878faddcc04d861b06e65d4
2014-10-18merge in lmp-mr1-release history after reset to ↵The Android Automerger
876e356dd86d0fc2a878faddcc04d861b06e65d4
2014-10-16merge in lmp-mr1-release history after reset to ↵The Android Automerger
876e356dd86d0fc2a878faddcc04d861b06e65d4
2014-10-15merge in lmp-mr1-release history after reset to ↵The Android Automerger
876e356dd86d0fc2a878faddcc04d861b06e65d4
2014-10-14merge in lmp-mr1-release history after reset to ↵The Android Automerger
876e356dd86d0fc2a878faddcc04d861b06e65d4
2014-10-13merge in lmp-mr1-release history after reset to ↵The Android Automerger
876e356dd86d0fc2a878faddcc04d861b06e65d4
2014-10-12merge in lmp-mr1-release history after reset to ↵The Android Automerger
876e356dd86d0fc2a878faddcc04d861b06e65d4
2014-10-11merge in lmp-mr1-release history after reset to ↵The Android Automerger
876e356dd86d0fc2a878faddcc04d861b06e65d4
2014-10-09merge in lmp-mr1-release history after reset to ↵The Android Automerger
e83d280b8646e24e700de249c2215690fe5450ff
2014-10-08am 04707de5: am f624d76a: Use ContactsProvider context when sending broadcastYorke Lee
* commit '04707de5ab7364052a74df2b5261e0215d5db345': Use ContactsProvider context when sending broadcast
2014-10-08am f624d76a: Use ContactsProvider context when sending broadcastYorke Lee
* commit 'f624d76a4ca27e4c80cd0f483500b0139e36c9c7': Use ContactsProvider context when sending broadcast
2014-10-08merge in lmp-mr1-release history after reset to ↵The Android Automerger
e83d280b8646e24e700de249c2215690fe5450ff
2014-10-07Use ContactsProvider context when sending broadcastYorke Lee
Bug: 17879141 Change-Id: Iebc12962837ce4c7c026aa792762317d90097d9d
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 03:05:02 +0000