Merge commit '6fb608ee67c3ad82baf2253b87b63fff8907992a'
* commit '6fb608ee67c3ad82baf2253b87b63fff8907992a':
Issue #1884058 (Need to only record frequency and duration for selected Google apps)
The Browser used to have a concern around mapping text extensions to various
text/* mime types. If a text extension mapped to an unknown text/* mime type,
the Browser would attempt to download a url instead of just displaying the
content.
There is another change in external/webkit that uses 2 static functions in
DOMImplementation that determine if a mime type is text or xml. The text
function in particular checks for a leading "text/" string in the mime type.
With that change, pruning text mime types is no longer needed.
Bug: 1988375
Merge commit 'da57856d749457e495bd860c4ff45aaaf87c9dab'
* commit 'da57856d749457e495bd860c4ff45aaaf87c9dab':
Add logging to help track down intermittent bug
205 is interpreted by Safari to be like 200 and show the given content. Change
canHaveResponseBody to allow 205 to have a body.
305 is a very rare server response indicating to the client to use the given
Location header as a proxy and reissue the original request. Curl doesn't do
anything with this header and neither does internal networking code. For now,
we will just allow the response body to propagate to webcore.
Merge commit '1126aad736f3322559007b8abc49e26f550e4b54'
* commit '1126aad736f3322559007b8abc49e26f550e4b54':
Revert the setLanguage() call to its previous implementation as
Merge commit '2a1aa6acbba5a3a9142d3e8bd6fe6e19d5fae6be'
* commit '2a1aa6acbba5a3a9142d3e8bd6fe6e19d5fae6be':
Define a broadcast intent for the web search provider changing. Unhide
Merge commit '592f1a65815598f705260df9dbe5488e3990b45d'
* commit '592f1a65815598f705260df9dbe5488e3990b45d':
Prevent the setLanguage() method in TextToSpeech to change the language
* changes:
Prevent the setLanguage() method in TextToSpeech to change the language for all current TextToSpeech instances by only caching the language value so it is used with each subsequent utterance for this instance. Synchronize calls to the engine around a global mutex since the engine isn't thread-safe, except for the stop() call which is meant to interrupt the synthesis loop.
for all current TextToSpeech instances by only caching the language
value so it is used with each subsequent utterance for this instance.
Synchronize calls to the engine around a global mutex since the engine
isn't thread-safe, except for the stop() call which is meant to interrupt
the synthesis loop.
Change 2934 introduced a bug that causes updates to an event on a
read-only shared calendar to be discarded by the device. The
issue is the server version is null for a read-only calendar.
bug=1990826
Merge commit '2acbec4918db4ab6eca32cf427ffd771c9efe35f'
* commit '2acbec4918db4ab6eca32cf427ffd771c9efe35f':
add comment to illuminate why we only dismiss the dialog when launching an intent for in app search
Merge commit '9ff71d38a060476ba19deacf12ddaeef3cbac00d'
* commit '9ff71d38a060476ba19deacf12ddaeef3cbac00d':
whoops, still need to dismiss when launching an intent for in-app search
Now that the search manager service handles hiding (not dismissing) and reshowing it
when the user hits back after launching a result, search manager can't cache
"mShowing". Also noticed a few other minor problems that was hosing the handling
of pause / resume to reshow the dialog, like moving some logic to onHide instead
of onDismiss.
Instead of calling remove(), which would hide the soft
keyboard, remove the WebTextView manually, so the soft
keyboard remains up (if it was up to begin with). WebView
will properly handle the keys now that the focus has
changed.
* changes:
Fix 1986313. WebKit assumes things happened in a certain order. In this case, we can't call LoadListener's nativeError until BrowserFrame's startLoadingResource returns. Otherwise, the failed request will not be removed from the DocLoader's request list. So the page will never finish loading.
