summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add private API to get merged primary and enterprise contactsRicky Wai2015-03-092-2/+89
| | | | | Bug: 19550047 Change-Id: I5f2a5e5d54af50cd0b41dd3105e10a4676d17388
* Enterprise phone lookup should return consistent result...Makoto Onuki2015-02-272-15/+40
| | | | | | | | | | | | | | | regardless of requested projections. In order to rewrite the cursor returned from the corp CP2, certain columns are needed to compute other columns. (e.g. PHOTO_URI requires _ID and PHOTO_FILE_ID). This CL fixes that by always requesting all columns to the corp CP2. Now rewriteCorpPhoneLookup() shrinks down the projection. Bug 19545750 Change-Id: Id817d069554ebc89759303760effb557b152d58a
* Fork ContactAggregator.java to ContactAggregator2.javaZheng Fu2015-02-261-0/+2834
| | | | | | This is to copy the file history for new aggregator. Change-Id: I57994a3c1ed0eaeaffa45bf921b2e17dbcf702d3
* am 1005a3d5: (-s ours) am 4914bbf7: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-260-0/+0
|\ | | | | | | | | * commit '1005a3d5741b7e529beefb05b24d3cbd70543b53': Import translations. DO NOT MERGE
| * am 4914bbf7: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-260-0/+0
| |\ | | | | | | | | | | | | * commit '4914bbf741fbe3ce6a2e4b1d2d86873e801801bc': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-02-2672-158/+14
| | | | | | | | | | | | | | | Change-Id: Iee7559bc48a92fb0d0a67c08dc810eb3597f9c85 Auto-generated-cl: translation import
* | | Add simple backup/restore to Call Log.Santos Cordon2015-02-252-12/+138
| | | | | | | | | | | | | | | | | | | | | | | | With this change, call log should be a part of traditional android backup. All call are backed up with this change. Subsequent changes will filter down the call log entries which are actually backed up. Change-Id: Id2e876003a2d0c020142eff7f65426d888fedfc1
* | | Add tests for CallLogBackupAgent.Santos Cordon2015-02-224-28/+254
| | | | | | | | | | | | | | | | | | Adds tests for writing and reading the state. Change-Id: Ie00b3ec0c976195e32275a0a9d75b47ee245966e
* | | Simple Backup Agent for the call log.Santos Cordon2015-02-203-1/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | Simple skeleton agent that reads the state of the call log. Does not actually do any backup. It logs what calls it would backup and what calls it would remove from backup. A subsequent CL will add the actual backup/restore of calls. Change-Id: Id8832c78a9a5aea71022b45c3cef79ca0b54f584
* | | Upgrade calllog DB to use ICC ID & source_phone_number.Santos Cordon2015-02-193-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To accomodate backup and restore of the call log, we have to convert the existing sub-ID to an ICC ID. Also, add the source_phone_number to the list of call log columns. The ICC ID improves backup and restore because it is persistent across different devices where a sub ID is not. If the user completely changes their SIM card, the source_phone_number will be helpful in identifying that scenario if the user kept their old phone. Change-Id: Ib35e25216691e580b5ea539929ff16b2e3d30b88
* | | am 6278612a: am a435c434: am 463d577c: am 6522ca93: Don\'t use ↵Makoto Onuki2015-02-193-22/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | queryContentProviders to avoid "transaction too large" exception * commit '6278612a04f0e79a30fbb4f35befeb61e9190db3': Don't use queryContentProviders to avoid "transaction too large" exception
| * | am a435c434: am 463d577c: am 6522ca93: Don\'t use queryContentProviders to ↵Makoto Onuki2015-02-193-22/+22
| |\ \ | | |/ | |/| | | | | | | | | | | | | avoid "transaction too large" exception * commit 'a435c434615cdcc0fa6e30eb090275fb584cfa2d': Don't use queryContentProviders to avoid "transaction too large" exception
| | * am 463d577c: am 6522ca93: Don\'t use queryContentProviders to avoid ↵Makoto Onuki2015-02-193-22/+22
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | "transaction too large" exception * commit '463d577c1cdabac1818a6bf70dc397e8f6136a4d': Don't use queryContentProviders to avoid "transaction too large" exception
| | | * am 6522ca93: Don\'t use queryContentProviders to avoid "transaction too ↵Makoto Onuki2015-02-193-22/+22
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | large" exception * commit '6522ca932caf4a4921115a2a3d13068c2357084c': Don't use queryContentProviders to avoid "transaction too large" exception
| | | | * Don't use queryContentProviders to avoid "transaction too large" exceptionMakoto Onuki2015-02-183-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, use getInstalledPackages, which knows how to circumvent the binder transaction size limit. Bug 18261831 Change-Id: I2725af045c60a47bfce6eab966a5c745b6c17870
* | | | | Persist pre-authorized URIsBrian Attwell2015-02-193-31/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When exposing the Authority API, reviewers requested the API be implemented properly instead of storing the pre-authorized values in memory. Bug: 18777272 Change-Id: I31e719b10803344f579bb89c8269f0a597a83c3c
* | | | | Merge "Add new metadata_sync table to facilitate android contacts backup."Zheng Fu2015-02-181-3/+47
|\ \ \ \ \
| * | | | | Add new metadata_sync table to facilitate android contacts backup.Zheng Fu2015-02-131-3/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new metadata_sync table will cache the meta data on raw contacts level from server before they are merged into other CP2 tables. The data column is the blob column containing all the backed up metadata for this raw_contact. This table should only be used by metadata sync adapter. Bug: 18930508 Change-Id: Iacafe812ed1fbb39b48331b6da56a35ac8f129dd
* | | | | | am 05dca035: (-s ours) am 752b2e03: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * commit '05dca0354e4183cf381c8f36c5ef455ddec65b76': Import translations. DO NOT MERGE
| * | | | am 752b2e03: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-120-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '752b2e037725f9154fb9f1d87142f0d07cebd230': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEGeoff Mendal2015-02-127-12/+12
| | |/ / | | | | | | | | | | | | | | | | Change-Id: Iba24aba68485ee2d4e01cfacb976932468dabcd8 Auto-generated-cl: translation import
* | | | resolved conflicts for merge of 6058a318 to masterBrian Attwell2015-02-030-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I66a56101ed27c7727d4b15d1a88f25e8603b36b8
| * | | am 489446d4: am 0f6927a6: Merge "Additional change to IS_SUPER_PRIMARY" into ↵Brian Attwell2015-02-033-6/+37
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '489446d42847dadac708ebaee2be68fe1ad409c6': Additional change to IS_SUPER_PRIMARY
| | * | am 0f6927a6: Merge "Additional change to IS_SUPER_PRIMARY" into lmp-mr1-devBrian Attwell2015-02-033-6/+37
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '0f6927a6946350dcb3031baa9ce1c7575f48307e': Additional change to IS_SUPER_PRIMARY
| | | * Merge "Additional change to IS_SUPER_PRIMARY" into lmp-mr1-devBrian Attwell2015-02-033-6/+37
| | | |\
| | | | * Additional change to IS_SUPER_PRIMARYBrian Attwell2015-02-033-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-0272-72/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6abfeebd24babeda9f586b6292421cfd2ec908d0 Auto-generated-cl: translation import
* | | | | Remove NAME_VERIFIED. Part3Brian Attwell2015-01-305-91/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support use of IS_SUPER_PRIMARY instead of NAME_VERIFIED. The contact aggregator now pays attention to IS_SUPER_PRIMARY. Remove all references to NAME_VERIFIED from CP2. Bug: 18777272 Change-Id: I1579a3122b2d45b80de7106a2b9616e323855045
* | | | | Handle DB schema migration to facilitate android contacts backupZheng Fu2015-01-301-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add backup_id column to raw_contacts table and hash_id column to data table. Add unique index on backup_id and account_id of raw_contacts table. Add index on hash_id of data table. Update the raw_contacts and data view to add the new columns. Bug: 18930508 Change-Id: I571c1115e7fb21e23b1956aaca8a80cf9d026e59
* | | | | Merge "No longer need to take care of pre boot msg."Dianne Hackborn2015-01-302-8/+0
|\ \ \ \ \
| * | | | | No longer need to take care of pre boot msg.Dianne Hackborn2015-01-292-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie000ca609dfeb166451dee24f0cd15622f09c19a
* | | | | | Additional change to IS_SUPER_PRIMARYBrian Attwell2015-01-283-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Revert "Additional change to IS_SUPER_PRIMARY"Brian Attwell2015-01-283-37/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c44ee526c56d2f5e680cef24897cff3a922d6a2f. Change-Id: I2d81fb028eb0672db9cc291ac187c2629435969d
* | | | | Additional change to IS_SUPER_PRIMARYBrian Attwell2015-01-283-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: I354ffe51ea64cc532387d7ba79fbb6d2389d662e
* | | | | Change IS_SUPER_PRIMARY reset logicBrian Attwell2015-01-262-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHANGES 1) change is_super_primary reset as discussed in go/proposed-change-to-resetting-super-primary-on-join 2) fix a bug in case #1 of testAggregation_clearSuperPrimary and extended the case a bit. Previously, both data rows had is_super_primary=false at setup instead of both true REASON This is mostly for the benefit of Lychee and future contact editor changes. This CL was also needed to make removing use of NAME_VERIFIED from GoogleContacts possible. At the very least, IS_SUPER_PRIMARY's behavior is now more consistent with NAME_VERIFIED. Bug: 5080996 Bug: 18777272 Change-Id: Ic3c17fcb1757f5966a7c6a52cf489083d5b8e51a
* | | | | am c219a079: am b5e3a4c8: am abaa423f: Fix cross profile caller id to use ↵Kenny Guy2015-01-261-13/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | manager profiles userid. * commit 'c219a07962ad9cdaed157af9bd72232f4e5e6820': Fix cross profile caller id to use manager profiles userid.
| * | | | am b5e3a4c8: am abaa423f: Fix cross profile caller id to use manager ↵Kenny Guy2015-01-261-13/+14
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | profiles userid. * commit 'b5e3a4c81b60a9db2174b0a4c24cff6606a82392': Fix cross profile caller id to use manager profiles userid.
| | * | | am abaa423f: Fix cross profile caller id to use manager profiles userid.Kenny Guy2015-01-261-13/+14
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'abaa423fa15f00b07b9c92c16ee186c909cac145': Fix cross profile caller id to use manager profiles userid.
| | | * | Fix cross profile caller id to use manager profiles userid.Kenny Guy2015-01-231-13/+14
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | AggregationSuggestions.Builder Part 3/3Brian Attwell2015-01-211-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unit tests for AggregationSuggestions types that have been deleted. These types were never implemented in the first place. Bug: 18777272 Change-Id: I5c4066d1e933cc4ab18df06809687ee2b7eac91c
* | | | Fix log TAG that was too longJay Shrauner2015-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Log tags >25 characters are dropped, so abbreviate Bug: 19030945 Change-Id: I3a66ffcb41977db24e2e3ff16e6f22b530a78584
* | | | Ubundle from contacts contract Part 2/3Brian Attwell2015-01-082-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ProviderStatus.DATA1 Discussion: go/contacts-contact-intent-ui Bug: 18777272 Change-Id: I9c6125cc30710e4637b38f3785608abb9928d1a2
* | | | Import translations. DO NOT MERGEBaligh Uddin2014-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia71ab0552db40211305bf72f614331305a0dca13 Auto-generated-cl: translation import
* | | | am 09b7e00a: am 2c919c4e: am becda5cc: Merge "Skip aggregation if candidate ↵Zheng Fu2014-12-102-2/+38
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | contact contains too many raw contacts" into lmp-mr1-dev * commit '09b7e00a7e2fad55b53a405902405338b4a831d8': Skip aggregation if candidate contact contains too many raw contacts
| * | | am 2c919c4e: am becda5cc: Merge "Skip aggregation if candidate contact ↵Zheng Fu2014-12-102-2/+38
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | contains too many raw contacts" into lmp-mr1-dev * commit '2c919c4e3a4bf1841f7f11855df44f7663bbbd92': Skip aggregation if candidate contact contains too many raw contacts
| | * | am becda5cc: Merge "Skip aggregation if candidate contact contains too many ↵Zheng Fu2014-12-092-2/+38
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | raw contacts" into lmp-mr1-dev * commit 'becda5cc4e265ab2cc3fc958e39de08380abd6c3': Skip aggregation if candidate contact contains too many raw contacts
| | | * Merge "Skip aggregation if candidate contact contains too many raw contacts" ↵Zheng Fu2014-12-092-2/+38
| | | |\ | | | | | | | | | | | | | | | into lmp-mr1-dev
| | | | * Skip aggregation if candidate contact contains too many raw contactsZheng Fu2014-12-092-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is likely an error or a shared corporate data element Bug:18641722 Change-Id: Icab78bcf621363a5b887095c043e2e1e3a2e1ca4
* | | | | am 0174e0ea: am e1f9e675: am eb10c527: Fix package manager ↵Jay Shrauner2014-12-091-11/+29
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | TransactionTooLargeException * commit '0174e0eac6deb3028f003477948cf58cd0fefabe': Fix package manager TransactionTooLargeException
| * | | | am e1f9e675: am eb10c527: Fix package manager TransactionTooLargeExceptionJay Shrauner2014-12-091-11/+29
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'e1f9e6758671bb350e30e8fb005c6e71615661d4': Fix package manager TransactionTooLargeException
generated by cgit v1.1 at 2025-02-10 22:03:34 +0000