Merge commit '358d4aa1e4b4282b7637fec24364ab286358c451'
* commit '358d4aa1e4b4282b7637fec24364ab286358c451':
Fix 2092386: Support yuyv for camera preview format.
Merge commit 'c0df3a473f6973cf32b343a886dd62559a4b93c7' into eclair-plus-aosp
* commit 'c0df3a473f6973cf32b343a886dd62559a4b93c7':
Fix 2092386: Support yuyv for camera preview format.
Merge commit 'd4b74574a071eaa692fe6612ee99f519f9f56311'
* commit 'd4b74574a071eaa692fe6612ee99f519f9f56311':
Add an 'init everything' operation to the first backup pass
Merge commit '3a66413af33f2f2a3511f644efe5b4e45198d7df' into eclair-plus-aosp
* commit '3a66413af33f2f2a3511f644efe5b4e45198d7df':
Add an 'init everything' operation to the first backup pass
IBackupTransport.performBackup() now takes a flag "wipeAllFirst", which if set
will result in the entire restore set for the current device/account being wiped
clean prior to the storage of the provided package. This ensures that a device
on which backup has just been enabled will not confront potentially-stale
information, nor will the restore set potentially contain mismatched data from
orphaned packages.
The Backup Manager has also been revised to pass this flag when first backing up
its master metadata block (and never pass it thereafter unless something has
caused the backup state tracking to be erased, e.g. the user has opted out of
backup and then later re-enabled it).
Merge commit '23bd5042ca6806995e019ea997f73740c754df9e'
* commit '23bd5042ca6806995e019ea997f73740c754df9e':
handle calendars with an access level of "root"
Merge commit '7d9db612bdecad3d6667858ac296f5ede27aabfa' into eclair-plus-aosp
* commit '7d9db612bdecad3d6667858ac296f5ede27aabfa':
handle calendars with an access level of "root"
Merge commit '9122a49cd68ab2a472516c568298699f376bf80a'
* commit '9122a49cd68ab2a472516c568298699f376bf80a':
Don't back up / restore certain sync-related settings
Merge commit 'd163f4babe101b89aaf322c34d3bafeae237f7da' into eclair-plus-aosp
* commit 'd163f4babe101b89aaf322c34d3bafeae237f7da':
Don't back up / restore certain sync-related settings
Merge commit '9603715ae3813290dcf18f2f6a3fb5299dc27a70' into eclair-plus-aosp
* commit '9603715ae3813290dcf18f2f6a3fb5299dc27a70':
Add better transition to rotary lock widget when triggering: spin around instead of snap back.
Merge commit '3bd5e2b22efe0da3864bc6d8c5aae68742c3c707'
* commit '3bd5e2b22efe0da3864bc6d8c5aae68742c3c707':
Add better APIs for the battery status, and other cleanup.
Merge commit 'e69335f8b4f4195e57613fe6b83e18e23e0c2760' into eclair-plus-aosp
* commit 'e69335f8b4f4195e57613fe6b83e18e23e0c2760':
Add better APIs for the battery status, and other cleanup.
Merge commit 'b7b083090f7312f83453e3f3c2e40a91644a3059'
* commit 'b7b083090f7312f83453e3f3c2e40a91644a3059':
Add API to send an ordered sticky broadcast.
Merge commit 'a382cb81187437aa389dc131687e181ceaefa8ba' into eclair-plus-aosp
* commit 'a382cb81187437aa389dc131687e181ceaefa8ba':
Add API to send an ordered sticky broadcast.
Merge commit 'ac810e53b70aa01c148c998c57f6888160e1557a' into eclair-plus-aosp
* commit 'ac810e53b70aa01c148c998c57f6888160e1557a':
Add new API for fetching UUIDs using SDP.
Add new API which clients can use to force an SDP query.
The result is broadcast using an intent having the UUIDs.
The intent is broadcast after a timeout, in case of an error.
This timeout is greater than the page timeout.
Change-Id: I61e6db4c05b34c42f679a66987e37e2063a793b6
Merge commit '46452f6c7efd834f54ffcf16cbb48ad0c00715d1'
* commit '46452f6c7efd834f54ffcf16cbb48ad0c00715d1':
When double tap zoom out to overview mode, force reveal the full
Merge commit '22bfcbca4f9f4e88dee120c5bf71545f40289e00' into eclair-plus-aosp
* commit '22bfcbca4f9f4e88dee120c5bf71545f40289e00':
When double tap zoom out to overview mode, force reveal the full
Merge commit '7235e015acb796f247fc18975b6438d6543f95ee'
* commit '7235e015acb796f247fc18975b6438d6543f95ee':
ContactsContract: Adding joined columns to the CommonDataKind class definitions.
Merge commit '4b5e7d908bfda633fea72f5d20dae63328019c93' into eclair-plus-aosp
* commit '4b5e7d908bfda633fea72f5d20dae63328019c93':
ContactsContract: Adding joined columns to the CommonDataKind class definitions.
Merge commit '2c6ca2676afe8fe3ee91cd03e1f31c6f61a78818'
* commit '2c6ca2676afe8fe3ee91cd03e1f31c6f61a78818':
ContactsContract: Adding joined columns to the Data class definition.
Merge commit '7714401570e01086f84e11e0383209eb0ccaf25f'
* commit '7714401570e01086f84e11e0383209eb0ccaf25f':
Revert "ContactsContract: Adding joined columns to the Data class definition."
The rationale is this. Since all these joined columns are currently on
different classes, we routinely see code like this:
private static final String[] PROJECTION_PHONE = {
Data._ID, // 0
Data.CONTACT_ID, // 1
Phone.TYPE, // 2
Phone.NUMBER, // 3
Phone.LABEL, // 4
Data.DISPLAY_NAME, // 5
};
After this change, the above declaration changes to:
private static final String[] PROJECTION_PHONE = {
Phone._ID, // 0
Phone.CONTACT_ID, // 1
Phone.TYPE, // 2
Phone.NUMBER, // 3
Phone.LABEL, // 4
Phone.DISPLAY_NAME, // 5
};
Change-Id: I2e84bca3277aeef06eec20cee8c2119ef3b90a9f
Merge commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59' into eclair-plus-aosp
* commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59':
ContactsContract: Adding joined columns to the Data class definition.
