summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Protect against null lookup uri"Jay Shrauner2015-03-231-1/+2
|\
| * Protect against null lookup uriJay Shrauner2015-03-131-1/+2
| | | | | | | | | | Bug:19588470 Change-Id: Iadfed46a7de067513463f12fa72bdd658f5b07f8
* | Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+35
| | | | | | | | | | Change-Id: Ifc6129fdc99f0b6d13464613913db07641baddbb Auto-generated-cl: translation import
* | Add Email.ENTERPRISE_CONTENT_LOOKUP_URIRicky Wai2015-03-192-48/+85
| | | | | | | | | | | | | | | | | | Like PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI Apps in primary profile can have email lookup in managed profile Bug: 19550046 Change-Id: I492909126faf4e1a2eb5c72f7f76f3a7a0656e6a
* | Merge "Add RawContactsEntity.CORP_CONTENT_URI"Ricky Wai2015-03-192-0/+17
|\ \
| * | Add RawContactsEntity.CORP_CONTENT_URIRicky Wai2015-03-182-0/+17
| | | | | | | | | | | | | | | Bug: 19551325 Change-Id: Ie0c31c951edab91b70b7587ab27b68db4e1f6fcd
* | | Merge " Fork ContactMatcher.java to RawContactMatcher.java"Zheng Fu2015-03-181-0/+456
|\ \ \
| * | | Fork ContactMatcher.java to RawContactMatcher.javaZheng Fu2015-03-181-0/+456
| | |/ | |/| | | | | | | | | | | | | This is to copy the file history for new raw contact matcher. Change-Id: I28f9e36d743268e2c17970175c09ba4d9aed86cd
* | | Add back upgrade actions that were lost from merging.Nancy Chen2015-03-181-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A merge from m-wireless-dev to master ended up merging two different upgrade steps into one, which means that any devices that were upgraded to version 1005 before the merge would not have undergone the upgrade from m-wireless-dev. Add another upgrade step to ensure the necessary upgrading happens. Bug: 19796706 Change-Id: Ibc7af5f1ff923e338d57170c9b9c289f89c32838
* | | Make contacts backup schema change accessible.Tingting2015-03-173-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | raw_contacts.backup_id and data.hash_id have been added to schema. To make them accessible, they need to be added to projection map. BUG 19667203 Change-Id: I7d122843668d7ed31fc998a2c7f00dc909181fc8
* | | Import translations. DO NOT MERGEGeoff Mendal2015-03-161-1/+1
| | | | | | | | | | | | | | | Change-Id: I8a4269ca0b5a3298f3a6ba644d2c52f6f213db51 Auto-generated-cl: translation import
* | | Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'Vinit Deshpande2015-03-166-13/+113
|\ \ \ | |/ / |/| | | | | Change-Id: I439330f8c022ce85005d84fd4286f4f1ffdced1c
| * | Upgrade voicemail_status and calls tables for visual voicemail.Nancy Chen2015-03-026-25/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do a database upgrade for MNC in order to add multi-SIM fields to the voicemail_status table and add "dirty" and "deleted" fields to voicemails table. Add functionality in DbModifierWithNotification to handle "dirty" and "deleted" appropriately. This new functionality is tested in VoicemailProviderTest and CallLogProviderTest. Bug:19236241 Change-Id: I25ebba0bdb5f720e48beaf17dbdd2846e494da74
| * | Upgrade calllog DB to use ICC ID & source_phone_number.Santos Cordon2015-03-023-3/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Add private API to get merged primary and enterprise contacts"Ricky Wai2015-03-102-2/+89
|\ \ \ | | |/ | |/|
| * | Add private API to get merged primary and enterprise contactsRicky Wai2015-03-092-2/+89
| | | | | | | | | | | | | | | Bug: 19550047 Change-Id: I5f2a5e5d54af50cd0b41dd3105e10a4676d17388
* | | Cache photo URI too in calllogMakoto Onuki2015-03-092-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enterprise phone lookup returns special photo URLs for corp contacts, which can't be obtained just with contact IDs. So we need to cache the URIs too and otherwise pictures sometimes don't show up. Bug 19546108 Change-Id: I48517da681c194b6ee4ca47dda57ccff81e76981
* | | Merge "Remove CallLogBackupAgent."Santos Cordon2015-03-075-677/+15
|\ \ \
| * | | Remove CallLogBackupAgent.Santos Cordon2015-03-065-677/+15
| | | | | | | | | | | | | | | | | | | | | | | | Moved to CallLogBackup.apk Change-Id: I1aee3bb1dc4378bff0d346d424692bc60b3fdc40
* | | | Merge "Prioritize regular names over phonetic names. P2/2"Brian Attwell2015-03-053-9/+112
|\ \ \ \ | |/ / / |/| | |
| * | | Prioritize regular names over phonetic names. P2/2Brian Attwell2015-03-053-9/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When choosing display names, prioritize StructuredNames that have more than phonetic components. I make no attempt to handle the case where a StructuredName with only phonetic components is marked super primary. If clients do this, the behavior is still undefined. Bug: 19587274 Change-Id: I503c0fff6da30b9f1d6b6cbeaedfc4d9314f8a00
* | | | Unhide call log entries by phone number.Santos Cordon2015-03-021-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the phone account does not match any call log entries, then run the unhiding query by the phone number instead of the specific phone account. This addresses the cases where a user gets a new SIM card for their existing phone number (e.g., switching service providers). Change-Id: Ib0d5e5a36ad7445e95148470c45d8fdabd9125f7
* | | | Hide unregistered phone account call log entries.Santos Cordon2015-03-035-21/+125
| | | | | | | | | | | | | | | | Change-Id: I238882e0dd3e63747a4eedcf3ff2af2c8d770dd4
* | | | Merge "Enterprise phone lookup should return consistent result..."Makoto Onuki2015-03-022-15/+40
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | 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
* | | Merge "More tests for CallLogBackupAgent"Santos Cordon2015-02-272-57/+166
|\ \ \ | |/ / |/| |
| * | More tests for CallLogBackupAgentSantos Cordon2015-02-262-57/+166
| | | | | | | | | | | | Change-Id: I5f8ff641bbd3b9c186cb6e2e230ae70d02055fe4
* | | 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
| | | |\
generated by cgit v1.1 at 2024-10-28 09:36:21 +0000