Merge commit '2ecf3f5e00ea2ac630ffb405baba33113596cf38' into eclair-plus-aosp
* commit '2ecf3f5e00ea2ac630ffb405baba33113596cf38':
dumpstate: Add backlight information to bugreport output.
Merge commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70' into eclair-plus-aosp
* commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70':
Attempt to fix [2152536] ANR in browser
Merge commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc' into eclair-plus-aosp
* 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-plus-aosp
* 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-plus-aosp
* commit '3d7bb3a5e49b559725bba84390b1021d9c527347':
Import revised translations. DO NOT MERGE
Merge commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-plus-aosp
* commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
a simple test app for gralloc
Merge commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620' into eclair-plus-aosp
* commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620':
Add a test pattern as rollo's icon
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.
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.
Merge commit '9b150b74573ce506abd00c692fb42f46980441a3' into eclair-plus-aosp
* commit '9b150b74573ce506abd00c692fb42f46980441a3':
Close the cursor before assigning a new one to the same variable.
Merge commit 'bbed0d68c815446400193bdc8b16fbf73e1ee664' into eclair-plus-aosp
* commit 'bbed0d68c815446400193bdc8b16fbf73e1ee664':
hide setGammaForText, which is only used for calibrating new devices
Merge commit '271cfe85ccfa6d94008dcebb3b97108ca325fe59' into eclair-plus-aosp
* commit '271cfe85ccfa6d94008dcebb3b97108ca325fe59':
improve boot animation a bit
Merge commit 'a6309c30722ad3aee88ddc2394cea2a499168d99' into eclair-plus-aosp
* commit 'a6309c30722ad3aee88ddc2394cea2a499168d99':
On BACK in search, hide just IME if IME is fullscreen