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
Merge commit '7d4acc5316c080d8e9787d2a7c84e2a2500b85f8' into eclair-mr2-plus-aosp
* commit '7d4acc5316c080d8e9787d2a7c84e2a2500b85f8':
Throttle camera preview frames to the app. Bug 2180302.
Merge commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1' into eclair-mr2
* commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1':
Add a little logging to diagnose wifi cycle bug
Merge commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42' into eclair-mr2
* commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42':
Throttle camera preview frames to the app. Bug 2180302.
Merge commit 'cfd55579c2e20514b181809dfaf30bd6f7e04c7e' into eclair-mr2-plus-aosp
* commit 'cfd55579c2e20514b181809dfaf30bd6f7e04c7e':
OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
Merge commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1' into eclair-plus-aosp
* commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1':
Add a little logging to diagnose wifi cycle bug
Merge commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42' into eclair-plus-aosp
* commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42':
Throttle camera preview frames to the app. Bug 2180302.
With higher frame rates and larger preview frames, we can easily
flood the application with too much data. This patch fakes the
old camera preview mode by doing continuous one-shot frames.
After the previous frame is handled, if the application hasn't
cleared the preview callback, we start another one-shot preview
frame. With this change, the application should never have more
than one preview frame unless it is explicitly saving references
to them.
modified: core/java/android/hardware/Camera.java
Until now we had been throwing UnsupportedOperationException when
developers tried to use the GL11 or GL11Ext methods. Now we handle
these methods correctly, passing their arguments through to the
wrapped interface's methods.
Fixes bug 2167522 GLUtils debug wrapper doesn't support GL11 features
Merge commit 'd5ad08bd4230c2f5d58969c624c39a3f5a2019d1' into eclair-mr2-plus-aosp
* commit 'd5ad08bd4230c2f5d58969c624c39a3f5a2019d1':
Continue caching "POST" result so that we won't get
Merge commit 'cf4f2c22cbe62843324718f657021ce0c459a3db' into eclair-mr2-plus-aosp
* commit 'cf4f2c22cbe62843324718f657021ce0c459a3db':
Support double-quote SSID in WifiService.
Merge commit '2e778c176d17c295f475141bddda9dca5cd65fce' into eclair-plus-aosp
* commit '2e778c176d17c295f475141bddda9dca5cd65fce':
Continue caching "POST" result so that we won't get
Merge commit '2e778c176d17c295f475141bddda9dca5cd65fce' into eclair-mr2
* commit '2e778c176d17c295f475141bddda9dca5cd65fce':
Continue caching "POST" result so that we won't get
+ push the double-quote handling down to framework.
wpa_supplicant keeps the ssid in a quoted string in the config file. However,
the UI currently needs to handle the quoted string which makes it difficult
to handle the SSID containing the quotes. The change will move the
supplicant-specific double-quote handling from UI to framework, i.e. to
add/remove doubel-quotes in framework instead of in UI settings.
