Merge commit 'fde23e398e9b880eec6269adf5afaca1f58e58f7'
* commit 'fde23e398e9b880eec6269adf5afaca1f58e58f7':
Fix a null pointer exception caught by the monkey.
Merge commit '9eca703d08ef2ef81796519fdd60a774380c7d4c'
* commit '9eca703d08ef2ef81796519fdd60a774380c7d4c':
setupRedirect() can throw. Catch it and signal the error.
Merge commit '86806ce11a89260147d7c2efa2c192b711d923db'
* commit '86806ce11a89260147d7c2efa2c192b711d923db':
Process synchronous requests in the same RequestQueue.
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
AbsListView can reject views from the recycler's scrap heap but when that
happens the rejected view is not detached from the parent. This can be pretty
bad in the case of TextView since it prevents them from unregistering their
OnPreDrawListeners.
Merge commit '88be4cb5ee6718a971f18cc14a5699204d28e082'
* commit '88be4cb5ee6718a971f18cc14a5699204d28e082':
Close the cursor before assigning a new one to the same variable.
Merge commit '51654b562b3faaf358b55124ad5290847bdceabd'
* commit '51654b562b3faaf358b55124ad5290847bdceabd':
On BACK in search, hide just IME if IME is fullscreen
Merge commit 'ad433430126bec9a1361dd857635aa494d3d6a10'
* commit 'ad433430126bec9a1361dd857635aa494d3d6a10':
remove cert for SampleBrowserPlugin and only check
Merge commit '41829e0138dbf3c3334eb3ca3bfcc08a26871f39'
* commit '41829e0138dbf3c3334eb3ca3bfcc08a26871f39':
Semi-workaround for #2027266: app drawer showing up on the side of the screen
Merge commit 'ff9af3f3ee0300e9aee93435008cfb62d5bee600'
* commit 'ff9af3f3ee0300e9aee93435008cfb62d5bee600':
Keep the scrollbar on during TOUCH_MOVE events even
Merge commit 'eff77e9a92c40d501f42b1774752b07d4e5141a7'
* commit 'eff77e9a92c40d501f42b1774752b07d4e5141a7':
Try to reconnect twice when the rfcomm error code is Connection Refused.
Merge commit '271fcd4ac9f2149ad1c25ae0bab6393677d5a032'
* commit '271fcd4ac9f2149ad1c25ae0bab6393677d5a032':
Add the signature checking for WebView plugins. The
Merge commit '2b3489ddad289387a68955fbfaa37461b4d8a911'
* commit '2b3489ddad289387a68955fbfaa37461b4d8a911':
Add documentation for scene mode. Other parameters may be changed after setting scene mode.
Merge commit '1dc38caf5fe5b479f50518b60e24c3c1df804dbf'
* commit '1dc38caf5fe5b479f50518b60e24c3c1df804dbf':
Add Turkish accented letters for G and S on the hard keyboard.
Merge commit '6678aeccec58f5ff306fb93ad4411208ed6227db'
* commit '6678aeccec58f5ff306fb93ad4411208ed6227db':
Turn off most of the backup-related debug logging
Merge commit '782d690fbdf79ff7e2c30e86a3639e4d025ade47'
* commit '782d690fbdf79ff7e2c30e86a3639e4d025ade47':
If the textfield is offscreen at the end of a zoom, remove it.
Merge commit '7a51b14d9f7f8c48c74ed1787bed3ef83aae6658'
* commit '7a51b14d9f7f8c48c74ed1787bed3ef83aae6658':
Check if rename of backed up file fails before persisting new changes.
Merge commit '9d2dc89cc32cfc768df390278fe18b72b868a718'
* commit '9d2dc89cc32cfc768df390278fe18b72b868a718':
Set BondState to Bonding only if it not Bonded already.
Merge commit 'e67de07627e5a35e499eeefdfb0334b50590d053'
* commit 'e67de07627e5a35e499eeefdfb0334b50590d053':
Fix issue #2154794: Force close when start facebook application.
Merge commit '04e8a925c00ef0a1bf58932b84253ed72daf8404'
* commit '04e8a925c00ef0a1bf58932b84253ed72daf8404':
Debugging for #2027266: app drawer showing up on the side
Merge commit '3f8e158a9dd27cc4c02be4e55fd51670563217d5'
* commit '3f8e158a9dd27cc4c02be4e55fd51670563217d5':
add class description and revise descriptions for
Merge commit 'e092e1f531de1fc2985b83c9ec6ff40551e148f0'
* commit 'e092e1f531de1fc2985b83c9ec6ff40551e148f0':
Fix for 2155255: Revert "Cache inflated view to avoid inflation of layouts in preferences"
Merge commit '5b95f83356f130e138f3e9a26a1580c479eb955d'
* commit '5b95f83356f130e138f3e9a26a1580c479eb955d':
Update <video> implementation after new IRC discussion with Eric Carlsson.
Merge commit '2fe7c9e51a5dd29be011fa618e74ad2c79b0d42d'
* commit '2fe7c9e51a5dd29be011fa618e74ad2c79b0d42d':
Handle bad lines in /proc/wakelocks : Fix for 2124260
Merge commit '09aa95bff32f5bc965bec63cd70443c1c0ff145d'
* commit '09aa95bff32f5bc965bec63cd70443c1c0ff145d':
Remove unused api in QuickContact.java and fix the build.
