Merge commit '1ff57418a7d58887301766031554a146c1ededd1'
* commit '1ff57418a7d58887301766031554a146c1ededd1':
Move map tiles to no-dpi since they are dpi-independent.
Merge commit '3a624abe2735168d288bf905ab9cb8ca60a77be5'
* commit '3a624abe2735168d288bf905ab9cb8ca60a77be5':
Work on issue 2259506: camera ANRed and then device runtime restarted
Merge commit '234e509a67eb32606f3051d21eb3ea25b272d80d'
* commit '234e509a67eb32606f3051d21eb3ea25b272d80d':
Add setPriority to allow wallpapers to run at lower cpu priority than default.
Merge commit 'd557614f3a8b5e25c9e1160bb28b4bdc7850c1c2'
* commit 'd557614f3a8b5e25c9e1160bb28b4bdc7850c1c2':
Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
Merge commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44'
* commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44':
Minor fix for the parent style computation in the layoutlib.
Merge commit '7174fcf6031234bfc9aa29bf3085d14742cab944'
* commit '7174fcf6031234bfc9aa29bf3085d14742cab944':
dumpstate: include the contents of the last radio log
Merge commit 'd5f787ab28199d417f8a50ccd031e31f5c6db509'
* commit 'd5f787ab28199d417f8a50ccd031e31f5c6db509':
Rename several files so that readers would not be confused.
Merge commit '340733697fcb0b73a707eb544b958af3121cdf60' into eclair-mr2-plus-aosp
* commit '340733697fcb0b73a707eb544b958af3121cdf60':
Move map tiles to no-dpi since they are dpi-independent.
Merge commit '92b1880084ccfbe2ae03eec6a9656c5372c03f12' into eclair-mr2-plus-aosp
* commit '92b1880084ccfbe2ae03eec6a9656c5372c03f12':
Work on issue 2259506: camera ANRed and then device runtime restarted
Merge commit '69e0b6646f109d17a5cff4b8c32582e3d3a3f544' into eclair-mr2
* commit '69e0b6646f109d17a5cff4b8c32582e3d3a3f544':
Move map tiles to no-dpi since they are dpi-independent.
Merge commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679' into eclair-mr2
* commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679':
Work on issue 2259506: camera ANRed and then device runtime restarted
There was a lock in AssetManager that purported to be per-instance (mSync)
but was actually static. A lot of code used it like it was per-instance,
but this would actually block all instances. This is now changed to fix
the name and make everything except the actual static data lock on the
specific AssetManager instance.
Change-Id: Ie8e9ad60f962184e76b2301f7a2790d0c2487063
Merge commit 'fc36afcba6e65f2e0816b1af08255b9ccafb17a6' into eclair-mr2-plus-aosp
* commit 'fc36afcba6e65f2e0816b1af08255b9ccafb17a6':
fix [2262591] Junk on screen in ERD46
Merge commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806' into eclair-mr2
* commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806':
fix [2262591] Junk on screen in ERD46
since we're using the GPU for composition, don't use a texture for dimming,
instead simply use an alpha-blended quad.
also workaround what looks like a GL driver bug by calling glFinish() before
glReadPixels().
Merge commit '22186a2c15cc752cfaaf8a12d415a3c097d338e0' into eclair-mr2-plus-aosp
* commit '22186a2c15cc752cfaaf8a12d415a3c097d338e0':
Add setPriority to allow wallpapers to run at lower cpu priority than default.
Merge commit 'f016fa632b1d3c606934bc11a889af3921c6120e' into eclair-mr2-plus-aosp
* commit 'f016fa632b1d3c606934bc11a889af3921c6120e':
Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
Merge commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b' into eclair-mr2-plus-aosp
* commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b':
Minor fix for the parent style computation in the layoutlib.
Merge commit 'a57632fee792d6078a7a61006f5a866c38addd33' into eclair-mr2-plus-aosp
* commit 'a57632fee792d6078a7a61006f5a866c38addd33':
Fix bugs around removing and attaching WebViews.
Merge commit 'f9bf75d59acd8efb45d7137df507241483b1ad34' into eclair-mr2-plus-aosp
* commit 'f9bf75d59acd8efb45d7137df507241483b1ad34':
dumpstate: include the contents of the last radio log
Merge commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b' into eclair-mr2-plus-aosp
* commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b':
Rename several files so that readers would not be confused.
Merge commit '92c12fae9a977ea1dcb9f4de56257d4945101db7' into eclair-mr2-plus-aosp
* commit '92c12fae9a977ea1dcb9f4de56257d4945101db7':
Fix Zygote -- don't depend on these classes that are no longer
Merge commit '8faa61c3304392a9ab02387b1adad49dc8a5e488' into eclair-mr2-plus-aosp
* commit '8faa61c3304392a9ab02387b1adad49dc8a5e488':
docs: update the publishing guide to revise the updating section
This change allows applications to nest children RemoteViews
inside an existing set of RemoteViews. These nested views
are inflated and treated as addView() calls.
This change also allows ViewFlipper through RemoteViews, and
adds logic surpress flipping when the parent window is
detached or behind the lockscreen. Also fixes ViewAnimator
to observe the measureAllChildren flag when set.
Fixes http://b/2239905
