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 'e4b6639dbcfe9c5a429fb6f216790d69d1b3a6e8' into eclair-mr2
* commit 'e4b6639dbcfe9c5a429fb6f216790d69d1b3a6e8':
Import revised translations. DO NOT MERGE
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
Don't hold a lock when the activity thread is telling the activity manager
to release a provider.
This requires that the activity manager now keep a reference count on the
providers, because without the lock it is possible for activity thread to
call in to request the provider again before it has finished telling
about the release.
Change-Id: I5f912903891f4edae85e28819d4e6f14b8f2e688
When the focus bounds is changed by webkit, reflect that
change on the UI side in the WebTextView. On the WebCore
side, add the focus-changed state to the Draw record,
which is sent whenever a new picture is recorded.
On the WebView side, set a bit when receiving the Draw
record, and check that bit when the picture is first drawn.
This additional delay is required so that the bit isn't
checked until after the new nav cache is swapped in.
If the bit is set when the draw occurs, clear it, and
set up the WebTextView's bounds.
companion change in external/webkit
fixes http://b/issue?id=2118781
This fixes an NPE that occurs when launching the intent
tries to access state cleared by onStop.
Bug: 2171752
Change-Id: I29232f2a44d8dfa27b2c79933093c0c8983b2e92
This fixes a race condition seen whenever show() is called before the timer in hide() triggers. This can happen
for example if the user hits "Emergency Dial" followed by the back button before the 0.5s timeout completes. The result
is a blank screen with no keyguard view and no means to recover on devices w/o a keyboard.
The bug caused us to sometimes remove the newly created KeyguardView instead of the old one, leaving the view empty.
The fix is to always remove the last view.
The lock screen's flag to force the status bar on was sometimes
interfering with the flag of the alarm behind to hide the lock screen.
Change-Id: I91368c56d09d35b03db548530aa1eb59197206bd
Merge commit '19400067b2bca066255118315877125d1e623cad' into eclair-mr2-plus-aosp
* commit '19400067b2bca066255118315877125d1e623cad':
Fix back button handling in ACTV
Merge commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd' into eclair-mr2
* commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd':
Fix back button handling in ACTV
Merge commit '2504fba7c408726cb690b2931b875c3d661e35d9' into eclair-mr2-plus-aosp
* commit '2504fba7c408726cb690b2931b875c3d661e35d9':
Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
Merge commit '460b60c9b064ef02e9eaf56ecf2f266fd7c4089c' into eclair-mr2
* commit '460b60c9b064ef02e9eaf56ecf2f266fd7c4089c':
Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
Merge commit '72da3a467e46453e87549492ccec47e1feda6fe2' into eclair-mr2-plus-aosp
* commit '72da3a467e46453e87549492ccec47e1feda6fe2':
Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Merge commit '160e97cb5de5c4e9877c1d47d23935a2066fa84e' into eclair-mr2-plus-aosp
* commit '160e97cb5de5c4e9877c1d47d23935a2066fa84e':
temporarily disable the use of glTexImage2D for sw buffers on sholes.
Merge commit '0ef55540ab75660c58b284415ebae7ea66684706' into eclair-mr2-plus-aosp
* commit '0ef55540ab75660c58b284415ebae7ea66684706':
fix [2168528] enable glTexImage2D code path in SF for software-only buffers
fix [2168531] have software-only gralloc buffer side-step the HAL
fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
Merge commit '12bb2c4c6d73c5b9e531ba852fb6260bb8b87411' into eclair-mr2-plus-aosp
* commit '12bb2c4c6d73c5b9e531ba852fb6260bb8b87411':
Fix tls crash on startup if more than one RS contexts are created in one process.
