Merge commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3' into eclair-mr2-plus-aosp
* commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3':
DO NOT MERGE Reverting change I53e91db7.
Merge commit '47cc8112c3f77637ef408ef18e48d146e8250a27' into eclair-mr2-plus-aosp
* commit '47cc8112c3f77637ef408ef18e48d146e8250a27':
Fix updating Bluetooth icon on status bar and for Wifi.
Merge commit '9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-mr2
* commit '9ae9763b7e5dd872619b13c889b72b0df176f956':
DO NOT MERGE Reverting change I53e91db7.
Merge commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564' into eclair-mr2
* commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564':
Fix updating Bluetooth icon on status bar and for Wifi.
Accidentally submitted into eclair instead of eclair-mr2.
I apparently rebased my mr2 working dir to eclair by mistake.
Do not merge this so the desired change will survive on mr2 as intended.
bug: 2265222
Status bar uses the SINK_STATE_CHANGE intent to determine the icon.
This intent also has the device. Thus, we can get this intent for any
device and we update the icon wrongly. The same problem is with Wifi.
This was not commonly observed till now, but with the car dock changes
its easy to reproduce as we can get an incoming connection from the
car's bluetooth system. For Wifi, this will cause coexistance issues
especially with desk docks.
Dr No: Eastham
Bug: 2133530
Merge commit '096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4' into eclair-mr2-plus-aosp
* commit '096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4':
Filter out minor Connectivity Notifications.
Merge commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-mr2
* commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
Filter out minor Connectivity Notifications.
Merge commit '6be01bf207077ffbdcd3879250171a26ec805835' into eclair-mr2-plus-aosp
* commit '6be01bf207077ffbdcd3879250171a26ec805835':
Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
Merge commit '247003be9ea69928e35ce2f1bd1fab652920a3f2' into eclair-mr2-plus-aosp
* commit '247003be9ea69928e35ce2f1bd1fab652920a3f2':
Initial checkin of stagefright MP3 audio decoder based on PV source code.
Don't send a connectivity change notification if the change is in detailed state only.
IE, Disconnect/Idle -> Disconnect/Scanning should not trigger a connection change
notification.
bug: 2265222
Merge commit '6761e85d41dedf4e783217922a5fedac2b7a654d' into eclair-mr2-plus-aosp
* commit '6761e85d41dedf4e783217922a5fedac2b7a654d':
Set InputType of WebTextView according to <input> field's type.
Merge commit 'ddcea3d21645bb3037703c84807dae077aae62ce' into eclair-mr2-plus-aosp
* commit 'ddcea3d21645bb3037703c84807dae077aae62ce':
Expose onReceivedSslError() so that the WebView client
Help fix http://b/issue?id=2150538 and http://b/issue?id=1890360
Use the <input type> information to set the InputType, so that
the IME can show the correct options. Also consolidate setup
of WebTextView into setType().
Requires a change in external/webkit.
Merge commit '14467eb2eea119b4d71dd7dd149479aa092e6de2' into eclair-mr2-plus-aosp
* commit '14467eb2eea119b4d71dd7dd149479aa092e6de2':
Add "res" support for WebView.
Merge commit 'ffacbc3419825ec1c786dd3c27f3e2a8cd071d8f' into eclair-mr2-plus-aosp
* commit 'ffacbc3419825ec1c786dd3c27f3e2a8cd071d8f':
Add Java exceptions to catch RS calls with no context or no surface.
Merge commit 'fd2f6358321e95d661f24ba4e08327268035aa59' into eclair-mr2
* commit 'fd2f6358321e95d661f24ba4e08327268035aa59':
Add Java exceptions to catch RS calls with no context or no surface.
Merge commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57' into eclair-mr2-plus-aosp
* commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57':
Allow room for descenders in am/pm text.
The ToneGenerator failed to initialize because no more tracks were available in AudioFlinger mixer.
All tracks were used because the duplicating output was failing to free the tracks on audio hardware output mixer when exiting due to a misplaced test on output activity: output tracks where only freed if the duplicating output was active when exiting.
The fix consists in freeing the output tracks when the duplicating thread is destroyed without condition.
Merge commit '8c7ab034692eea550b97bebd7746e1a82735bbbd' into eclair-mr2-plus-aosp
* commit '8c7ab034692eea550b97bebd7746e1a82735bbbd':
Fixing the build, only instantiate the software aac decoder in full stagefright builds.
Merge commit '73abc2ea4c4e23a5561bbf769b4b74d1faa38e4a' into eclair-mr2-plus-aosp
* commit '73abc2ea4c4e23a5561bbf769b4b74d1faa38e4a':
Initial check in of stagefright software AAC decoder based on PV source code.
Merge commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1' into eclair-mr2-plus-aosp
* commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1':
Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Merge commit '8e6d79e2b570d73b620a4f5a98d461329e5f2477' into eclair-mr2-plus-aosp
* commit '8e6d79e2b570d73b620a4f5a98d461329e5f2477':
1) Capture the start memory before the test started
