Merge commit '94f3a36326ddecaa09787d795451b0a229fe111c'
* commit '94f3a36326ddecaa09787d795451b0a229fe111c':
Remove STOPSHIP BT logging.
BT API security audit: fix a couple of permission mistakes.
Fix issue #2175693: Add vmallocinfo to dumpstate
add a way to easily catch and log GL errors (compile time flag)
GPS: Fix problem with SUPL when SUPL APN is already active.
Import revised translations. DO NOT MERGE
Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Import revised translations. DO NOT MERGE
Merge commit '1c83540e3829dc9664728f1f017686f16f61a4ea'
* commit '1c83540e3829dc9664728f1f017686f16f61a4ea':
Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
Merge commit '6036288ad953e56433a9936fad09213b328cad71'
* commit '6036288ad953e56433a9936fad09213b328cad71':
Make FWK start a wifi scan if supplicant forgets.
Merge commit '39c923a94c377a75e34153f6dddb83fc9883d2a7'
* commit '39c923a94c377a75e34153f6dddb83fc9883d2a7':
Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
Merge commit '0221ec55ac57f32a42fb1e7b66779ca955d58558'
* commit '0221ec55ac57f32a42fb1e7b66779ca955d58558':
Control H icon display in Status bar.
Fixes#2175599. Prevents an NPE when AttachInfo is null.
Set the Bond State to NONE when we receive a Agent Cancel.
Make vCard import Photo from vCard file :(
Merge commit 'd34f3994da32d0fcf5f6d6824d123d51c02c988e' into eclair-mr2-plus-aosp
* commit 'd34f3994da32d0fcf5f6d6824d123d51c02c988e':
Work on issue #2144454: Inconsistent swipes...
Merge commit 'a6b76c35a482bd7f2cbab186aca9ea6e74a375d0'
* commit 'a6b76c35a482bd7f2cbab186aca9ea6e74a375d0':
The vendor is about to check in a fix for this issue, the workaround is no longer needed
Merge commit 'ec61707d39c14950f53795b0610ea1ee00daecdb'
* commit 'ec61707d39c14950f53795b0610ea1ee00daecdb':
fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204
Merge commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d' into eclair-mr2
* commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d':
Work on issue #2144454: Inconsistent swipes...
Merge commit '9136c39d4933bcf60bff0f76bc377d1985736ea5'
* commit '9136c39d4933bcf60bff0f76bc377d1985736ea5':
Retry overlay create if it fails. Bug 2153980.
Add script to script call support. Add exception to catch out of bound index data when added to TriangleMeshBuilder.
fix [2170283] SurfaceFlinger crashes on OOM.
fix [2164183] sometimes device just wants to stay asleep
when logging free space on /data, log /system and /cache as well
Merge commit '145928617af865e867f6f27e99173d2a756b9dfd' into eclair-mr2-plus-aosp
* commit '145928617af865e867f6f27e99173d2a756b9dfd':
Enabling plugin surfaces to update their position in the UI.
This introduces some hacks in the framework to try to clean up the
data we are getting from the touch screen. There are two main things
being done here:
1. Look for changes in position that are unreasonably large, and
ignore them. This is intended to eliminate the spurious jumps that
often happen when releasing.
2. Add some simple adaptive averaging of the touch data. If the
difference between the last and next point is large enough, we
disable the averaging; otherwise we average up to the last 5 points.
The goal is to get rid of the noise of small movements so that things
like taps don't look like short flings, while still responding quickly
to rapid movement.
For averaging pressure, we also weight each averaged coordinate by
the reported pressure at that point. This is intended to keep the
coordinates closer together during a release, when the pressure is
going down and the accuracy decreasing. It may also result in some
other interesting artifacts, but hopefully nothing problematic.
Change-Id: I1369e9ab015c406946a45c2d72547da9c604178f
Since the caller expects the data to fit within a certain amount of
space, do not copy into the buffer if the data exceeds that space.
Requires a change to external/webkit
Merge commit 'b65a90d76ff486208974f0b1dac8e880ba29174b' into eclair-mr2-plus-aosp
* commit 'b65a90d76ff486208974f0b1dac8e880ba29174b':
Check cursor and URI value for nullity to prevent NPE.
Merge commit 'c642199d1d60176980e2781bb78f42dce93e1c84' into eclair-mr2-plus-aosp
* commit 'c642199d1d60176980e2781bb78f42dce93e1c84':
Separated private from public header files.
Merge commit 'fe324a61c39d5db59f09fdae81c808d7851841e6' into eclair-mr2-plus-aosp
* commit 'fe324a61c39d5db59f09fdae81c808d7851841e6':
Fix various compiler warnings accumulated over time.
Merge commit 'ceabc645d1e4c84b6f8d8b01725a6fa68719842a' into eclair-mr2-plus-aosp
* commit 'ceabc645d1e4c84b6f8d8b01725a6fa68719842a':
Add a little logging to diagnose wifi cycle bug
