Merge commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-mr2
* commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
Work on issue #2163789: Way too much logging
Merge commit '87d5004d3b62441a55b2aba870e4276af6c771eb' into eclair-mr2
* commit '87d5004d3b62441a55b2aba870e4276af6c771eb':
decode the search string before putting it into the search control.
Merge commit '2ecf3f5e00ea2ac630ffb405baba33113596cf38' into eclair-mr2
* commit '2ecf3f5e00ea2ac630ffb405baba33113596cf38':
dumpstate: Add backlight information to bugreport output.
Merge commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70' into eclair-mr2
* commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70':
Attempt to fix [2152536] ANR in browser
Merge commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc' into eclair-mr2
* commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc':
Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion.
Merge commit '6b3707452c5921c89258371eec140b0fb76766f8' into eclair-mr2
* commit '6b3707452c5921c89258371eec140b0fb76766f8':
bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Merge commit '3d7bb3a5e49b559725bba84390b1021d9c527347' into eclair-mr2
* commit '3d7bb3a5e49b559725bba84390b1021d9c527347':
Import revised translations. DO NOT MERGE
Merge commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-mr2
* commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
a simple test app for gralloc
Merge commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620' into eclair-mr2
* commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620':
Add a test pattern as rollo's icon
Merge commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3' into eclair
* commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3':
decode the search string before putting it into the search control.
The ANR is caused by SurfaceFlinger waiting for buffers of a removed surface to become availlable.
When it is removed from the current list, a Surface is marked as NO_INIT, which causes SF to return
immediately in the above case. For some reason, the surface here wasn't marked as NO_INIT.
This change makes the code more robust by always (irregadless or errors) setting the NO_INIT status
in all code paths where a surface is removed from the list.
Additionaly added more information in the logs, should this happen again.
We now just don't send out dock broadcasts/launches when the
device is not provisioned. Good enough for our purposes.
Change-Id: Iee6384121675e0e9854745ec1168245e8a23a241
Use a dedicated Connection to process a synchronous request using the main
RequestQueue and on the WebCore thread.
HttpConnection, HttpsConnection, Connection:
No need for ConnectionManager, just pass the proxy host to
HttpsConnection. In Connection.clearPipe, empty should be set to true if the
RequestFeeder does _not_ have a request for the host. I don't think that
broke anything but it is incorrect.
ConnectionThread:
Refactor the proxy selection into ConnectionManager.getConnection
RequestHandle:
Add a new constructor that takes a Connection argument. Add processRequest
to process a single request on that Connection.
RequestQueue:
Add determine host to select between the request's host and the proxy. Add
queueSynchronousRequest to make a new request that operates on a private
connection. Add SyncFeeder to handle RequestFeeder.requeueRequest if the
request fails.
Network: Use the new RequestQueue api to handle a synchronous request.
Bug: 1315832
This is the frameworks/base part of the fix for Bug 2158434: add a new
callback to the OnDialTriggerListener interface, so the RotarySelector can
tell the app about state changes between NOTHING_GRABBED and
LEFT_HANDLE_GRABBED and RIGHT_HANDLE_GRABBED.
BUG=2158434
DRNO=timsullivan
TESTED=regular incoming calls, call waiting calls, answering a call,
rejecting a call. Also verified I didn't affect the
lock screen at all.
