Merge commit '8138cb49e47f9a9905a316a217757710185c66aa' into froyo-plus-aosp
* commit '8138cb49e47f9a9905a316a217757710185c66aa':
Make Surface.toString() show more useful info to help debug bug 2594388.
The start and end times were precisely the same so, a ">" check needed to be ">=".
Also removed useless code and removed the potential problem where continuous gradual
advancement of your start and end times would prevent resets.
bug:2629717
Change-Id: Ieced1965a5611a9b555e92bcf924ec350f2a80db
Merge commit '0ff9212d077e77f8b3e0afa232293306c0f72d07' into kraken
* commit '0ff9212d077e77f8b3e0afa232293306c0f72d07':
Handle throttling being disabled via policy change
Merge commit '19681af44b7c7494ae8de28dab8aacc3e9d92390' into froyo-plus-aosp
* commit '19681af44b7c7494ae8de28dab8aacc3e9d92390':
Handle throttling being disabled via policy change
Merge commit '31431b34f895862ae13efba30bb5771085572687' into kraken
* commit '31431b34f895862ae13efba30bb5771085572687':
Switch to use software MP3 decoder
Merge commit '374aee6888edddc5bcac9a644ad3de812404d3bc' into froyo-plus-aosp
* commit '374aee6888edddc5bcac9a644ad3de812404d3bc':
Switch to use software MP3 decoder
Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low.
bug - 2608400
Change-Id: Ia0b5b6521015fc8d3e086117fa914dcc20ace5bd
Merge commit '60ae65ed30564969b3e14642394c5e22c019125d' into kraken
* commit '60ae65ed30564969b3e14642394c5e22c019125d':
Restrict the range request to the servers claiming
Merge commit '7fca18d4eadd3da0e616f2663aca41be4a01ec2f' into kraken
* commit '7fca18d4eadd3da0e616f2663aca41be4a01ec2f':
Fix aapt to build in Windows SDK under Linux
Merge commit 'bd17156fda946fa0594687337bbd43cd85300940' into kraken
* commit 'bd17156fda946fa0594687337bbd43cd85300940':
Only honor the scrollbar mode at the minimum zoom
Merge commit '87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6' into froyo-plus-aosp
* commit '87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6':
Restrict the range request to the servers claiming
Merge commit '29355534384ee24bfe9a3bc97d7664dbe478b4fb' into froyo-plus-aosp
* commit '29355534384ee24bfe9a3bc97d7664dbe478b4fb':
Fix aapt to build in Windows SDK under Linux
Merge commit '85a8dcec5460edda72e9917d4f02ad1b6a133251' into froyo-plus-aosp
* commit '85a8dcec5460edda72e9917d4f02ad1b6a133251':
Only honor the scrollbar mode at the minimum zoom
Fixed public.xml value padding for kraken/master
Merge commit '81cd2e90' into manualmerge
Conflicts:
api/current.xml
Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71
The test runner will only load TestCase classes that have a public
constructor with either no params or a single String parameter.
This is fairly subtle behavior and can be difficult to catch. This change
adds a log message when a TestCase class is not loaded, and adds some
associated unit tests.
Change-Id: I6fc63e4179c949620f5773e0ae134f99905a6fb2
from WebCore, then we would enter the ACTION_UP handler and cancel
pending touch events in WebCore's message queue. This cancellation
was orginally needed for Flash but the touch model for Flash has now changed
and it's no longer necessary. In the case of the layout test controller
the events do come very fast, and we were hitting this case so
WebCore was losing the events that got cancelled meaning that the
JS touch callbacks weren't getting invoked.
This was exposed by fast/events/basic-single-touch-events.html.
Change-Id: Icea09fb55a5b77f7ab9c19473cfa5ae272867a9a
Merge commit 'cdf96f75da540d880ae6070d861aeb6adabbe9a3' into kraken
* commit 'cdf96f75da540d880ae6070d861aeb6adabbe9a3':
Fix typo when parsing external platform version from Settings.
Merge commit '8b0047f82504ebc9b282ed950a85a758b59c4e14' into froyo-plus-aosp
* commit '8b0047f82504ebc9b282ed950a85a758b59c4e14':
Fix typo when parsing external platform version from Settings.
