Merge commit '9d6783e774c5ade517dbba7c28cf3a16fdb4e635'
* commit '9d6783e774c5ade517dbba7c28cf3a16fdb4e635':
[Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI
Merge commit '622da6829f11f0cacdbd6fe3b58f230d98115ed5' into eclair-plus-aosp
* commit '622da6829f11f0cacdbd6fe3b58f230d98115ed5':
[Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI
This makes the system a little more careful to not start third party
code until it is ready to.
Also fix a little bug in SyncManager that would cause it to crash
during boot if sync was in a failure state.
Change-Id: Ib2d287d8441d155d393fe740a5f98690895fd358
Merge commit '14de0880dd7b716f39b822917e874ca5e579ff37' into eclair-plus-aosp
* commit '14de0880dd7b716f39b822917e874ca5e579ff37':
suppress syncs until boot is complete
Merge commit 'cf4fe3efaaae38153478ada5007f681e2e8a2008'
* commit 'cf4fe3efaaae38153478ada5007f681e2e8a2008':
Prevent a crash when webkit changes the selection.
Merge commit '449d42c9ac161a7f3bad3ca9f13568448f003910'
* commit '449d42c9ac161a7f3bad3ca9f13568448f003910':
Get drawable directory for the platform buttons.
Merge commit 'f6ca7fab5043e1c3e834c15b4e674ae0c5c37d0d' into eclair-plus-aosp
* commit 'f6ca7fab5043e1c3e834c15b4e674ae0c5c37d0d':
Prevent a crash when webkit changes the selection.
Merge commit '010bed7419e96f5310be25d9317405d360f90b9c' into eclair-plus-aosp
* commit '010bed7419e96f5310be25d9317405d360f90b9c':
Get drawable directory for the platform buttons.
Partial fix for http://b/issue?id=2081673
This prevents a crash. However, if the user continues typing
into the textfield, the selection is incorrect. The real solution
(forthcoming), will make sure that the WebTextView's text gets
updated when webkit updates.
Change-Id: Ic832ec48fd4236c8116c5cbda1467677ad731feb
Merge commit '743a7495ab365d8a84a25ac93e22b6e6e4c5e0b4'
* commit '743a7495ab365d8a84a25ac93e22b6e6e4c5e0b4':
Make new attribute EXTRA_CHANGED_COMPONENT_NAME in
Merge commit '23db17314d32b56727123d21e3ca899a441c2a60' into eclair-plus-aosp
* commit '23db17314d32b56727123d21e3ca899a441c2a60':
Make new attribute EXTRA_CHANGED_COMPONENT_NAME in
* changes:
Make new attribute EXTRA_CHANGED_COMPONENT_NAME in broadcast intent ACTION_PACKAGE_CHANGED public so that apps like launcher can find out the changed component name when loading changes made in components.
broadcast intent ACTION_PACKAGE_CHANGED public so that
apps like launcher can find out the changed component name
when loading changes made in components.
Merge commit '04e1faf0f030ddb360180289fb798adbb3348dd4' into eclair-plus-aosp
* commit '04e1faf0f030ddb360180289fb798adbb3348dd4':
Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
Merge commit 'db7dde6bd3f6352bb9af3b03232a9407a53d87e2'
* commit 'db7dde6bd3f6352bb9af3b03232a9407a53d87e2':
Adding a convenience method to resolve contact lookup URI to a regular content URI
Merge commit '8ecd2aecf66010e974d9125f40282168be76b440' into eclair-plus-aosp
* commit '8ecd2aecf66010e974d9125f40282168be76b440':
Fix some sign in errors.
Merge commit '0a29985895069cc7a34d5511a292d779eae36426' into eclair-plus-aosp
* commit '0a29985895069cc7a34d5511a292d779eae36426':
Don't crash when a user taps on a fast track trigger that isn't hooked up to a contact.
