Merge commit 'fa62a0478e40c1730c04a417cf9ec4fa5d1991e5'
* commit 'fa62a0478e40c1730c04a417cf9ec4fa5d1991e5':
Fix the reporting of ActiveApnTypes on CDMA
Merge commit 'dfab8b687039ef764249c22c00d0b030c55067da'
* commit 'dfab8b687039ef764249c22c00d0b030c55067da':
check for null item in web history in saveState
Merge commit '11bb09c3829c6dc6874ed833bf9adcb1bc3195e3'
* commit '11bb09c3829c6dc6874ed833bf9adcb1bc3195e3':
EventLog when a database file is deleted due to corruption.
Merge commit 'a4f2ac7e0e2cc4cfcf19c7ac536fe0dd0306354c'
* commit 'a4f2ac7e0e2cc4cfcf19c7ac536fe0dd0306354c':
Allow scrolls to continue when getting a new content size.
Merge commit 'aed865207f7425f6c4d0538decb04109c415410d'
* commit 'aed865207f7425f6c4d0538decb04109c415410d':
Clean up cacheColorHint to be better controlled by the theme.
Merge commit '9274988e444da3b8652912f1a3c0cf0847f19fe3'
* commit '9274988e444da3b8652912f1a3c0cf0847f19fe3':
Fix the reporting of ActiveApnTypes on CDMA
Merge commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51'
* commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51':
Fix bug where we would return null with disabled components.
Merge commit '4df43ab1d834f839f3b1e535554836a936902d00'
* commit '4df43ab1d834f839f3b1e535554836a936902d00':
Fix issue #1930911: Crash in system process
Merge commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5'
* commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5':
Finish off java API to allow fading scrollbars
Merge commit '019116ce202021e1b274516c9813aeff83b1b5ab'
* commit '019116ce202021e1b274516c9813aeff83b1b5ab':
Don't ask for pbuffer support, because we don't use any pbuffers.
Print out EGL configuration info for the config we've chosen.
Merge commit 'ac35dc4716a448734493d939a1cb5af4d03cf41c' into eclair-plus-aosp
* commit 'ac35dc4716a448734493d939a1cb5af4d03cf41c':
Implement the checkin option in AccountManagerService.dump()
Merge commit 'd35afcda674eaa0222f0adbf8d712bde3a388a39' into eclair-plus-aosp
* commit 'd35afcda674eaa0222f0adbf8d712bde3a388a39':
border for the non-badge case
Merge commit 'c78b2bf474623eaa83ef517c4d648aa6595b8575' into eclair-plus-aosp
* commit 'c78b2bf474623eaa83ef517c4d648aa6595b8575':
New hdpi assets for framework.
With this change, the vCard composer does not emit any information
about CHARSET until it is really needed for parsing it (e.g. when
non-ascii chacacters are included in some value). This "may" be
effective toward external vCard importers which are not able to
understand non-ascii characters and CHARSET info itself.
Also now vCard composer does not use Quoted Printable until it is
really needed (e.g. until when the composer find non-"7bit"
characters are included in some value. "7bit" is defined in vCard 2.1,
which is "<7bit us-ascii printable chars, excluding CR LF>".
The vCard composer detects duplicate phone numbers, email addresses,
and remove them in default. The duplication would come from
aggregation done by the new ContactsProvider introduced in Eclair.
Even when two Accounts have two exactly same addresses, we cannot
ask ContactsProvider to exclude them since current implementation of
ContactsProvider2#queryEntities() does not acceps Contacts.CONTENT_URI
but only RawContacts.CONTENT_URI, which inevitably returns same
email addresses with different Accounts (ACCOUNT_NAME and ACCOUNT_TYPE
should be different. If not, the original contact itself should have
the duplication).
The vCard composer now detects null returned from queryEntities().
The null value is potentially harmful for vCard file, since it forces
the (old) vCard composer to emit meaningless line like "BDAY:".
Internal Issue number: 2150768, 2151954, 2154235
Merge commit 'ab18206e209e1ef019c2837856ff53c635d3032f' into eclair-plus-aosp
* commit 'ab18206e209e1ef019c2837856ff53c635d3032f':
Fix the reporting of ActiveApnTypes on CDMA
Merge commit '4fbf81bc94f38a630de49445e3eb4880289c6a6e' into eclair-plus-aosp
* commit '4fbf81bc94f38a630de49445e3eb4880289c6a6e':
check for null item in web history in saveState
* changes:
Fix some metadata retriever issues: 1. mRetriever was initialized twice: one in the constructor and the other in the setDataSource 2. cached the mode so that setMode can still be called before setDataSource. mRetriever won't be initialized until data source is set; thus we have to do this
