Merge commit 'b7024b1cf11f7a0d0c62be867027823d56469709'
* commit 'b7024b1cf11f7a0d0c62be867027823d56469709':
Try not to crash the system server because of corrupt restore data
Merge commit '68f591b17537cb437ca0b25d00a6d3d08e507abb' into eclair-plus-aosp
* commit '68f591b17537cb437ca0b25d00a6d3d08e507abb':
Try not to crash the system server because of corrupt restore data
When we're about to allocate an array based on the restore data for purposes of
unflattening a signature block, don't automatically assume that it's valid. If
it's corrupt [and we've seen this in practice] we can wind up trying to allocate
an array with 1.8 million objects, and throw an OutOfMemoryError, bringing down
the system.
This change arbitrarily decides that no package should have more than 20
signatures in its block, and aborts the restore if the metadata is thus revealed
to be corrupt.
Merge commit '95e022ec6a960cb34fa524ba7a57adfe92b6b48f'
* commit '95e022ec6a960cb34fa524ba7a57adfe92b6b48f':
Process: Add support for using scheduler policies instead of cgroups.
Merge commit '52646559afa672dc261c02067771501bdfb77783'
* commit '52646559afa672dc261c02067771501bdfb77783':
Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
Merge commit '181b31a0d87d525ea64102a965210331e0c6885b' into eclair-plus-aosp
* commit '181b31a0d87d525ea64102a965210331e0c6885b':
Process: Add support for using scheduler policies instead of cgroups.
Merge commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3' into eclair-plus-aosp
* commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3':
Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
add documentation to notify developers about variable
camera specifications and add some more links
Change-Id: I46ef9811af17858cbc6547f88e626becb481b043
Merge commit '88e3f827e657ef741099b24896c17533fa9ef61e' into eclair-plus-aosp
* commit '88e3f827e657ef741099b24896c17533fa9ef61e':
Allow an alternate eri file.
For testing purposes it is deseriable to allow
vendors to provide an alternate eri file. This
fixes Part A of bug 2108379.
Bug:2108379
Change-Id: I51703c9ac211ced053418e28e277dfab68deea21
Merge commit '635c4b41ca2d8c8b697527e8b4039aef99d6efde'
* commit '635c4b41ca2d8c8b697527e8b4039aef99d6efde':
Fix issue #1943927: need notification in status bar when adb is active
Merge commit 'e1d85dca89d45d2fca7b379827ee33ae656b61fb'
* commit 'e1d85dca89d45d2fca7b379827ee33ae656b61fb':
Dialog titles would sometimes use a font too large.
Merge commit 'e8f0603eb631ecef5f41105711f4afdea8c6d8d8' into eclair-plus-aosp
* commit 'e8f0603eb631ecef5f41105711f4afdea8c6d8d8':
Fix issue #1943927: need notification in status bar when adb is active
Merge commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890' into eclair-plus-aosp
* commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890':
Dialog titles would sometimes use a font too large.
Merge commit '1224c8830dee489436081cf18be49167b1aad2e6'
* commit '1224c8830dee489436081cf18be49167b1aad2e6':
[Issue 2099206] Encoding phone number prior to sending it to the phone lookup filter
Merge commit 'e1fd02400d69c059db2cc6299c893eba4096cc1d' into eclair-plus-aosp
* commit 'e1fd02400d69c059db2cc6299c893eba4096cc1d':
default dithering to ON (cheap, looks good)
Merge commit '84b4d37dd1e9269f73c2a9cacadcd88ec4256e3f' into eclair-plus-aosp
* commit '84b4d37dd1e9269f73c2a9cacadcd88ec4256e3f':
[Issue 2099206] Encoding phone number prior to sending it to the phone lookup filter
Some more tweaks and fixes to wallpapers. Make sure wallpapers are
told they are not visible when the screen is off. Add some new animations
for transitions across tasks, and fiddle with many of the existing
animations. Clean up the relationship between translucent activities
and animations. Add new API to start a PendingIntent from an
activity.
Change-Id: Ie0bf45fe44081bb6982c75361257a55d9cd9d863
Merge commit '52356ab108597dd6014fcf4eaad54b336fb95b67'
* commit '52356ab108597dd6014fcf4eaad54b336fb95b67':
Fix for bug # 2023074: settings db updater broken at version 34.
Merge commit '0cb94317d7460dadd4032a3596b27c9d03184941'
* commit '0cb94317d7460dadd4032a3596b27c9d03184941':
Add component name to informational logging in OMXCodec.cpp
Merge commit 'dc9555fb64b3fe53a06e7eabbf4a31018b9ee1ac' into eclair-plus-aosp
* commit 'dc9555fb64b3fe53a06e7eabbf4a31018b9ee1ac':
Fix for bug # 2023074: settings db updater broken at version 34.
Merge commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528' into eclair-plus-aosp
* commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528':
Add component name to informational logging in OMXCodec.cpp
Merge commit 'a1e3c40ce9a9647e3355b0343c38690ae0465752'
* commit 'a1e3c40ce9a9647e3355b0343c38690ae0465752':
Add timestamp support for call history vcard
Merge commit '2d3f9c559366ede6aefe9bcff554ef9c4eac21dd' into eclair-plus-aosp
* commit '2d3f9c559366ede6aefe9bcff554ef9c4eac21dd':
Add timestamp support for call history vcard
