Merge commit '9d33d953a04eb9288c8b842610baf24c164346aa' into eclair-plus-aosp
* commit '9d33d953a04eb9288c8b842610baf24c164346aa':
Keep the scrollbar on during TOUCH_MOVE events even
Merge commit 'c868acf442a69429056a574c67a5e0187e2b9536' into eclair-plus-aosp
* commit 'c868acf442a69429056a574c67a5e0187e2b9536':
show events in the UI
Merge commit '8ad6d524e48d88ff9d5606cea0df56b4c1dafe28' into eclair-plus-aosp
* commit '8ad6d524e48d88ff9d5606cea0df56b4c1dafe28':
Try to reconnect twice when the rfcomm error code is Connection Refused.
Merge commit '7648bd1f0005b869e87708b62442a8ad9884266a' into eclair-plus-aosp
* commit '7648bd1f0005b869e87708b62442a8ad9884266a':
Stop bringing the wifi interface up on reset.
Merge commit 'ade1aacf4cb9a43b85f0c70b145b42127c54f065' into eclair-plus-aosp
* commit 'ade1aacf4cb9a43b85f0c70b145b42127c54f065':
Add the signature checking for WebView plugins. The
Merge commit '5f3c928f5ecdd2f41f238807c59241d34a02517e' into eclair-plus-aosp
* commit '5f3c928f5ecdd2f41f238807c59241d34a02517e':
Turn off the last of the STOPSHIP verbose debugging
Merge commit '5e5001bc1a065f6d578b953b908052d623272fcd' into eclair-plus-aosp
* commit '5e5001bc1a065f6d578b953b908052d623272fcd':
Add documentation for scene mode. Other parameters may be changed after setting scene mode.
Merge commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e' into eclair-plus-aosp
* commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e':
Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
Merge commit '88f2acb066f2b66a01807ad4f3d26ef575a1bf37' into eclair-plus-aosp
* commit '88f2acb066f2b66a01807ad4f3d26ef575a1bf37':
Add Turkish accented letters for G and S on the hard keyboard.
Merge commit '15a5bffb7efc59895a92e6072717e001d2d9480c' into eclair-plus-aosp
* commit '15a5bffb7efc59895a92e6072717e001d2d9480c':
Revert setDataEnabled to setting a master switch.
Merge commit '4c9a29efdbf58034c1d90eb001dc7299f1f012ea' into eclair-plus-aosp
* commit '4c9a29efdbf58034c1d90eb001dc7299f1f012ea':
Set Sink State when ACL disconnects.
Merge commit '5eb7c9d3e880032972c0d03dd34d9432fa7c719d' into eclair-plus-aosp
* commit '5eb7c9d3e880032972c0d03dd34d9432fa7c719d':
Fix padding around QuickContactBadge in ContactHeaderWidget
Merge commit '6988dd59680ba4ec67c0e6ad14444e4763af8d01' into eclair-plus-aosp
* commit '6988dd59680ba4ec67c0e6ad14444e4763af8d01':
Fix 2133205: Change the opacity to allow more of the background to be seen on locked screen
Merge commit '436344ae12c819f58306ceb94241a266141e1218' into eclair-plus-aosp
* commit '436344ae12c819f58306ceb94241a266141e1218':
Turn off most of the backup-related debug logging
Merge commit '10be7542327e1d4483b33730164e5404ed48d73e' into eclair-plus-aosp
* commit '10be7542327e1d4483b33730164e5404ed48d73e':
If the textfield is offscreen at the end of a zoom, remove it.
The problem comes from the fact that the AudioSystem callback indicating that the media server is active again is ignored if it is received before the delayed message indicating media server death. This happens if another application or service running in the system server process makes a request to the AudioSystem in the interval between the death of the media server and the reception of the corresponding delayed message.
The fix consists in resetting mMediaServerOk flags immediately when the death callback is received and not when the delayed message is received.
This happens when the the remote headset is in a bad state or is
not accepting connections. Try twice before giving up.
Change-Id: I55e15bad6b72904b8e4ccbca89e17e9bd3ddb61e
