add a function that uses replace() to replace all
instances of '<' and '>' with the HTML entities and use
this wherever the query text is added onto the page.
Merge commit '4ac5066d53b40ec59a1f30ca11b8d5e1ba25659d' into eclair-mr2-plus-aosp
* commit '4ac5066d53b40ec59a1f30ca11b8d5e1ba25659d':
Disambiguation between multiple pointers and swipe gestures.
Merge commit '02d89898c9b48426d5add48868a640c198a3321f' into eclair-mr2-plus-aosp
* commit '02d89898c9b48426d5add48868a640c198a3321f':
Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
Merge commit '8d1eeb2144945365cae281552bd7bc5eb14f7688' into eclair-mr2-plus-aosp
* commit '8d1eeb2144945365cae281552bd7bc5eb14f7688':
PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit '53976509639b136150a844ff92544f96cf048943' into eclair-mr2-plus-aosp
* commit '53976509639b136150a844ff92544f96cf048943':
doc change: fix broken link at top of installing doc
Merge commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63' into eclair-mr2-plus-aosp
* commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63':
Fixed the H263 video duation which caused the incorrect video validation.
Merge commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b' into eclair-mr2-plus-aosp
* commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b':
Run the metadataretriever at background priority. Bug 2187133.
Merge commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed' into eclair-mr2-plus-aosp
* commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
Because of the asynchronous behavior of keyguard, and incall explicitly
disabling keyguard, sometimes the window manager would wind up in a state in
which the "correct" app and activity window were shown, but focus was
recalculated "too soon," at a time when keyguard was just about gone but not
quite, and incall was not yet fully shown. In this case there was no currently
valid event target, but the final show of the incall window would not prompt a
focus recalculation, so that "no current focus" state would incorrectly persist,
resulting in spurious ANRs until some other phone activity forced a focus
update.
We now detect the problematic case when windows are shown, and make sure to
recalculate focus explicitly thereafter. This change does *not* fix the
underlying race conditions that have been resulting in mismatched state within
the window manager, but it does force a validation pass that puts things in
order so that normal operation can continue.
Change-Id: I8e7f5f0795f0042a0da074aeed385e3fbc210360
Merge commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d' into eclair-mr2
* commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d':
Disambiguation between multiple pointers and swipe gestures.
Merge commit 'a2058e431736810503bc85fadec31a8e0bfcad95' into eclair-mr2
* commit 'a2058e431736810503bc85fadec31a8e0bfcad95':
Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
Merge commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec' into eclair-mr2
* commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec':
PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit 'd14f1bd7e4ba28489bdc472aa736aee5a587cb98' into eclair
* commit 'd14f1bd7e4ba28489bdc472aa736aee5a587cb98':
docs: add 2.0 video to developer site feature videos
Merge commit '5a4d66965d3c5061d47201fcaa62c90d126e7187' into eclair
* commit '5a4d66965d3c5061d47201fcaa62c90d126e7187':
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
Merge commit '37ebfad1619f250bda4803dfb8683f408d9482cb' into eclair-mr2
* commit '37ebfad1619f250bda4803dfb8683f408d9482cb':
doc change: fix broken link at top of installing doc
Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-mr2
* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
Fixed the H263 video duation which caused the incorrect video validation.
Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-mr2
* commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85':
Run the metadataretriever at background priority. Bug 2187133.
Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-mr2
* commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
Merge commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2' into eclair-mr2-plus-aosp
* commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2':
Add Authentication Type field to the APN settings.
Merge commit 'ed7755cc30fe6b2b0254207347629ad0cae094db' into eclair-mr2-plus-aosp
* commit 'ed7755cc30fe6b2b0254207347629ad0cae094db':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '34180d328c57a6a38bc85651fda0e69890ad7a9b' into eclair-mr2-plus-aosp
* commit '34180d328c57a6a38bc85651fda0e69890ad7a9b':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit '6158038a09069bc178970160d4b3667573bfc655' into eclair-mr2
* commit '6158038a09069bc178970160d4b3667573bfc655':
Add Authentication Type field to the APN settings.
Merge commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372' into eclair-mr2
* commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit 'a47d153647d8750b667942ad80e7b905ea98c68b' into eclair-mr2
* commit 'a47d153647d8750b667942ad80e7b905ea98c68b':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
* changes:
Fix bug 2201417. Whenever the System setting that indicates whether the notifcation stream uses the ring volume changes, the table of stream volume aliases in AudioService is updated. But the name of the alias stored in VolumeStreamState.mVolumeIndexSettingName was not updated whenever the NOTIFICATIONS_USE_RING_VOLUME setting was updated. This caused the wrong volume setting to be persisted. This change ensures the setting name is updated whenever the volume alias is, and persists the notification volume change right away (instead of after a delay), so that registered observers are notified right away. The notification seekbar in the sound settings is an example of such an observer.
