Merge commit 'cc7f40a88d64cbb4e664e231668ae4e2862036c6' into eclair-plus-aosp
* commit 'cc7f40a88d64cbb4e664e231668ae4e2862036c6':
log an error when loading an existing GL driver fails
Merge commit 'eb8aad7b2a99d3332a2fa6d8778356d634c47127' into eclair-plus-aosp
* commit 'eb8aad7b2a99d3332a2fa6d8778356d634c47127':
Fix up the first-backup-ever tracking
This changes a couple of bits of the Backup Manager's logic around
first-backup-ever handling. First, it uses the same "what we've ever backed up"
handling as the rest of the system for purposes of instructing the backend to do
a wipe when the metadata is initialized for the device, instead of looking at
the presence of the @pm@ file. Secondly, for the time being we won't be using
the saved state produced by agents' doRestore() logic. Until the server is
migrating each restored package's data over to the new dataset, this was
resulting in the client holding an agent state blob for which no data existed on
the server under this device's identity but which the device thought was fully
up to date.
Merge commit 'ef51eeed2a1e18280630e2ef46b3226843ec9b70'
* commit 'ef51eeed2a1e18280630e2ef46b3226843ec9b70':
Clean up spin animation in rotary selector, and be even more generous for triggering.
Merge commit 'f4d3e93e94382ad30047e0d3ed315aae76b2d177'
* commit 'f4d3e93e94382ad30047e0d3ed315aae76b2d177':
Fix issue #1862317: Browser does not appear to honor anchors (#es) in links
Merge commit '6b96512601bf37d840a99c8d82dcfbcc0427b33c' into eclair-plus-aosp
* commit '6b96512601bf37d840a99c8d82dcfbcc0427b33c':
Clean up spin animation in rotary selector, and be even more generous for triggering.
Merge commit '238dc72f742efd8b9d87dc66c38c304cd6e0399c' into eclair-plus-aosp
* commit '238dc72f742efd8b9d87dc66c38c304cd6e0399c':
Fix issue #1862317: Browser does not appear to honor anchors (#es) in links
Merge commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112' into eclair-plus-aosp
* commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112':
Fix issue with printing gles version in aapt dump badging option
* changes:
Fix issue with printing gles version in aapt dump badging option If the name attribute for uses-feature or uses-permission is empty the error value is still empty indicating error and preventing the else part from being checked as it should be.
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 '584b48d24b5200b2d307f08b2c346474f33d7190'
* commit '584b48d24b5200b2d307f08b2c346474f33d7190':
Modified random variable to use java.security.SecureRandom for authentication challenge genration.
Merge commit 'b7da7dd0a3c9db59854d2ef01b3fe7b999ec14c2' into eclair-plus-aosp
* commit 'b7da7dd0a3c9db59854d2ef01b3fe7b999ec14c2':
Add ring back tone notification.
Merge commit '00a3823db55e3667ee6a2aa14b565db5dfb88df9' into eclair-plus-aosp
* commit '00a3823db55e3667ee6a2aa14b565db5dfb88df9':
Modified random variable to use java.security.SecureRandom for authentication challenge genration.
Some networks may not play ring back tone, RIL will send UNSOL ringback notification.
Apps can register for ring back tone msg and play tone to user for receiving ALERTING message.
The return value indicates to play or stop ring tone.
If the name attribute for uses-feature or uses-permission is empty
the error value is still empty indicating error and preventing the
else part from being checked as it should be.
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"
This call has been synchronus since Bluez3.36.
However, since the semantics for all Bluetooth API calls are
asynchronous make this so too. It does fix an occasional ANR
seen while unpairing.
Change-Id: If81f8ec262ea1f6f62775282ab33855a8669c41a
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
