Merge commit '274b120f3975c8db6daeeab51a5fe08d6dede479' into eclair-plus-aosp
* commit '274b120f3975c8db6daeeab51a5fe08d6dede479':
Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit '274b120f3975c8db6daeeab51a5fe08d6dede479' into eclair-mr2
* commit '274b120f3975c8db6daeeab51a5fe08d6dede479':
Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit 'b25cb21f59da53f138bc516a6047f55a2c412764'
* commit 'b25cb21f59da53f138bc516a6047f55a2c412764':
Prevent crash in Home when using widgets whose ids collide with Home's
Merge commit 'cc2d3572e9cdcb8b9011b664d2e0247d9d7b8c96'
* commit 'cc2d3572e9cdcb8b9011b664d2e0247d9d7b8c96':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Merge commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98' into eclair-mr2-plus-aosp
* commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98':
Prevent crash in Home when using widgets whose ids collide with Home's
Merge commit 'f53f86a743a91b4383e480dcf44a8e7b16ca7fa0' into eclair-mr2-plus-aosp
* commit 'f53f86a743a91b4383e480dcf44a8e7b16ca7fa0':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-mr2
* commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca':
Prevent crash in Home when using widgets whose ids collide with Home's
Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-plus-aosp
* commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca':
Prevent crash in Home when using widgets whose ids collide with Home's
Merge commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-mr2
* commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Merge commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-plus-aosp
* commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Merge commit 'c3c2f76682151c5051a02269b1990b6644a9074c'
* commit 'c3c2f76682151c5051a02269b1990b6644a9074c':
New live wallpaper API to expose author and description strings.
Merge commit '1bca7612dfeb78bba91f3985fb6f3567daf13a57' into eclair-mr2-plus-aosp
* commit '1bca7612dfeb78bba91f3985fb6f3567daf13a57':
New live wallpaper API to expose author and description strings.
Merge commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-mr2
* commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137':
New live wallpaper API to expose author and description strings.
Merge commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-plus-aosp
* commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137':
New live wallpaper API to expose author and description strings.
Merge commit '990179755525d01a7e005182d8ec04722c7fd396'
* commit '990179755525d01a7e005182d8ec04722c7fd396':
a possible fix for the bug http://b/issue?id=2200637
Merge commit '195a507fc364d249c8ff4d3cd86dea00f383b0aa' into eclair-mr2-plus-aosp
* commit '195a507fc364d249c8ff4d3cd86dea00f383b0aa':
a possible fix for the bug http://b/issue?id=2200637
Merge commit '653d5d415c3447a4250120548bf32d1ee63fe36f'
* commit '653d5d415c3447a4250120548bf32d1ee63fe36f':
Fix issue 2203561: Sholes: audio playing out of earpiece.
Merge commit 'fcae6c71794696a074cabf20beeb02fd87853e30' into eclair-mr2-plus-aosp
* commit 'fcae6c71794696a074cabf20beeb02fd87853e30':
Fix issue 2203561: Sholes: audio playing out of earpiece.
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-plus-aosp
* commit '67b692920c18f99b096dce285adc6f7439fa866c':
Fix issue 2203561: Sholes: audio playing out of earpiece.
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2
* commit '67b692920c18f99b096dce285adc6f7439fa866c':
Fix issue 2203561: Sholes: audio playing out of earpiece.
Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error.
Do the same if start fails due to the same error after time out in obtainBuffer().
Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails.
This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash.
Same modifications for AudioRecord.
Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
Merge commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3' into eclair-mr2-plus-aosp
* commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3':
Add tests for Japanization part of vCard.
Merge commit '77e68484f5592e06ca1a881745070f7931641246'
* commit '77e68484f5592e06ca1a881745070f7931641246':
Remove unused field and add new API to control the children drawing order.
Merge commit '05abe8d01d91389b4b52111ed525aa4c4f4e1b71' into eclair-mr2-plus-aosp
* commit '05abe8d01d91389b4b52111ed525aa4c4f4e1b71':
Remove unused field and add new API to control the children drawing order.
Merge commit '131564d26ac5b7f963c60802089b9fe1472659f7' into eclair-mr2
* commit '131564d26ac5b7f963c60802089b9fe1472659f7':
Remove unused field and add new API to control the children drawing order.
Merge commit '131564d26ac5b7f963c60802089b9fe1472659f7' into eclair-plus-aosp
* commit '131564d26ac5b7f963c60802089b9fe1472659f7':
Remove unused field and add new API to control the children drawing order.
Merge commit '122f412a0177c54e32d52a23bf92b78aae4679f7'
* commit '122f412a0177c54e32d52a23bf92b78aae4679f7':
Add support for colored LED on jogball backlight.
Merge commit '76922b8378f235e79fd861ba846bed833199e59f' into eclair-mr2-plus-aosp
* commit '76922b8378f235e79fd861ba846bed833199e59f':
Add support for colored LED on jogball backlight.
