Merge commit '585fb14c56bd6cdce1f84246bad40e144dd1db61'
* commit '585fb14c56bd6cdce1f84246bad40e144dd1db61':
Print error message if the buffer size is too small.
Merge commit 'c75857873536d4206ba02c0f84fcd2dfd9bc05ea'
* commit 'c75857873536d4206ba02c0f84fcd2dfd9bc05ea':
Store CA certificate chain into one single key entry with PEM format.
Merge commit '940da9836aa6ce72cd025aedd1cf78c3dd277240' into eclair-plus-aosp
* commit '940da9836aa6ce72cd025aedd1cf78c3dd277240':
Print error message if the buffer size is too small.
Merge commit '9c64d59027a09699ec5ef1f0fedd88910ee7ae27' into eclair-plus-aosp
* commit '9c64d59027a09699ec5ef1f0fedd88910ee7ae27':
Store CA certificate chain into one single key entry with PEM format.
Merge commit '9b6a8ab8221f2df20c32711b0f1e4f301165fac2' into eclair-plus-aosp
* commit '9b6a8ab8221f2df20c32711b0f1e4f301165fac2':
Add camera parameters constants and methods.
Merge commit '9073dc69b110cbd0d4bebd128ed6cc2b24a16695'
* commit '9073dc69b110cbd0d4bebd128ed6cc2b24a16695':
Expand apps' control over the settings restore process
Merge commit '9756a70bd92fb844d2fd8346cc4bb6c8bb768c4b' into eclair-plus-aosp
* commit '9756a70bd92fb844d2fd8346cc4bb6c8bb768c4b':
Expand apps' control over the settings restore process
Applications can now specify two more aspects of the restore process: whether
they need to run with their own custom Application subclass rather than being
launched in the usual restricted mode during restore, and whether it's okay for
the backup manager to kill the app process once restore has completed. The new
manifest attributes for these are, respectively, android:restoreNeedsApplication
and android:killAfterRestore.
If unspecified in the manifest, restoreNeedsApplication is false, and
killAfterRestore is true.
In order to support kill-after-restore cleanly, this change also adds a new
system-process-only interface to the Activity Manager, which will schedule a
"commit suicide" event on the target app's main thread looper.
The framework backup agents have been given the appropriate new backup
attributes as well.
Merge commit 'f4cca783dff5335108647ff7ae86983f56245067' into eclair-plus-aosp
* commit 'f4cca783dff5335108647ff7ae86983f56245067':
Update fountain to use structures.
Merge commit 'a457424bfb7991d648aa7620549a09205f8acd13'
* commit 'a457424bfb7991d648aa7620549a09205f8acd13':
Wait for HCI to come up if getting the adapter path fails.
Merge commit 'c937b5ce4ff2f39fd9c60f718f98550a932b62f0' into eclair-plus-aosp
* commit 'c937b5ce4ff2f39fd9c60f718f98550a932b62f0':
Wait for HCI to come up if getting the adapter path fails.
Merge commit '2d2d5c4372b8ea5cf925c838b2149686211445af' into eclair-plus-aosp
* commit '2d2d5c4372b8ea5cf925c838b2149686211445af':
Update 4.xml to the most recent APIs.
Merge commit 'c804efe278fa33555e6e836504a467cb14505eb3' into eclair
* commit 'c804efe278fa33555e6e836504a467cb14505eb3':
Update 4.xml to the most recent APIs.
Merge commit 'd862c3ccdbfba5082df34fbb736a94d993dc064c'
* commit 'd862c3ccdbfba5082df34fbb736a94d993dc064c':
- don't schedule syncs that we will never dispatch
Merge commit '04f6da353d4e79f49ba1d4897ed617e91acc3f77' into eclair-plus-aosp
* commit '04f6da353d4e79f49ba1d4897ed617e91acc3f77':
- don't schedule syncs that we will never dispatch
Merge commit '3a87a91176f0f7bb58c7054a8909a19320c98195'
* commit '3a87a91176f0f7bb58c7054a8909a19320c98195':
Modify the gain after filtering to prevent TTS clipping in en-US.
Merge commit 'b1461fb4824f872faff40b206383d5e0faeda2ea' into eclair-plus-aosp
* commit 'b1461fb4824f872faff40b206383d5e0faeda2ea':
Modify the gain after filtering to prevent TTS clipping in en-US.
Merge commit '1726b4830298e59c5db9509b121cdecbe9b5ae50'
* commit '1726b4830298e59c5db9509b121cdecbe9b5ae50':
dumpstate: Add support for apanic crash data
Merge commit '775745c40c27f1131a98fa2857f061324c6b7709'
* commit '775745c40c27f1131a98fa2857f061324c6b7709':
When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue.
Merge commit '65d62c774e42d8bf9a55ef50e153ffc9e277ef37' into eclair-plus-aosp
* commit '65d62c774e42d8bf9a55ef50e153ffc9e277ef37':
Add hasIccCard to IccCard and TelephonyManager.
