Merge commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f' into eclair-mr2
* commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f':
Fix the layoutlib test to run from adt-tests.
Merge commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5' into eclair-mr2
* commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5':
Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit '71060f29855745893c122e8b93cf7a723186931b' into eclair-mr2
* commit '71060f29855745893c122e8b93cf7a723186931b':
Refactor class/method names used by layoutlib_create.
Merge commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd' into eclair-mr2
* commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd':
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
* changes:
Add cancel() VCardDataBuilder, which is intended to remove a false alerm "Nested VCard code is not supported now." when importing vCard 3.0 file.
Merge commit '9e4c85614c861f095131ffa76e65cbba55d03d0a' into eclair-mr2
* commit '9e4c85614c861f095131ffa76e65cbba55d03d0a':
Don't reinflate search bar when dialog is already showing
Merge commit '9830a4ac42c9e16db91d1de6120cc2eb613fc946' into eclair-mr2
* commit '9830a4ac42c9e16db91d1de6120cc2eb613fc946':
Fix issue #2161169: onStop not being called.
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.
