Merge commit '09481271507cfac0db2f27b878f4a453ed919fb1'
* commit '09481271507cfac0db2f27b878f4a453ed919fb1':
Track CPU speed stepping to get more accurate CPU cost per app.
Merge commit '5ea916b17cf0071f4d49936a370f4b873e4eb3e3' into eclair-plus-aosp
* commit '5ea916b17cf0071f4d49936a370f4b873e4eb3e3':
Track CPU speed stepping to get more accurate CPU cost per app.
Merge commit 'ffe1cf251a4f8469695b8acfa37270684dc1b70c' into eclair-plus-aosp
* commit 'ffe1cf251a4f8469695b8acfa37270684dc1b70c':
Unhide Camera lock and unlock API.
Merge commit 'cc7f40a88d64cbb4e664e231668ae4e2862036c6' into eclair-plus-aosp
* commit 'cc7f40a88d64cbb4e664e231668ae4e2862036c6':
log an error when loading an existing GL driver fails
More CPU speed stepping happening with newer devices, so we need
to qualify CPU time with the CPU speed, since power consumption
varies greatly by speed. Apps that peg the CPU should get a higher
penaltly.
Also, fix for 2062930: NPE at VolumePreference.onKey()
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