Merge commit '1b4c0d702066794b9ce97b02721aa9e552997381' into froyo-plus-aosp
* commit '1b4c0d702066794b9ce97b02721aa9e552997381':
Fix a crash in BatteryStatsImpl, due to a previous fix.
Merge commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a' into froyo-plus-aosp
* commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a':
Make createVideoThumbnail and createImageThumbnail look consistent.
This is probably the real fix for the original bug. The last line was probably not
well formed and resulted in an overrun in the native code.
Bug: 2564824
Change-Id: I8a9cc267f8045a61eff4b5d532258afa32a8b837
Merge commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c' into froyo-plus-aosp
* commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c':
check for webviewcore before reading settings
In setActive(), the WebViewCore instance may
have already been destroyed before the settings
object can be read.
Change-Id: I46b2a57b2d92fc7216b1c984f7044fea1fc2409e
http://b/2570700
Merge commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e' into froyo-plus-aosp
* commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e':
Only include WEB_EDIT if there are more textfields.
The problem turns out to have been a deep weirdness in the way that keyguard
and incall interact. Incall gets relaunched when the keyboard is opened/closed,
which transiently exposes keyguard with its nosensor orientation demands, and
that plus the long keyguard-hide animation was leaving incall in a bad state
from which the window manager didn't try to recover.
We now disregard animating-towards-hidden windows [i.e. keyguard] when running
through the app tokens to determine what orientation should be, and do not do
configuration calculations at all while the display is frozen. There can still
be a transient state in which incall is drawn in landscape, but things proceed
from there to relaunch it back into the proper portrait orientation, and it
ends up in the right state in the end.
Change-Id: I0d74ee19064b6d7f65600976f1b5b16b7ec36f31
Merge commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0' into froyo-plus-aosp
* commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0':
Make sure when WebView modified mScrollX/Y directly,
Merge commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a' into froyo-plus-aosp
* commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a':
Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
onScrollChanged() is called so that the View system
can do what it needs to adjust.
As WebView's onScrollChanged will call sendOurVisibleRect(),
we don't need to call it explicitly any more.
Fix http://b/issue?id=2438457
Look for corrupted bytes and replace with ?
If the problem is in the parsing code, then this will not help.
Change-Id: If33643f126a4099d4113e37760c6ef74683fe97e
Merge commit 'eb6e3edc0f21c5c8a574f8086f9622c44c0ff866' into froyo-plus-aosp
* commit 'eb6e3edc0f21c5c8a574f8086f9622c44c0ff866':
Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.
Merge commit '6df44727d06548015e741dd8f63716602ed1e5d1' into froyo-plus-aosp
* commit '6df44727d06548015e741dd8f63716602ed1e5d1':
Unhiding TTS API constants and methods needed for TTS plugin support.
Merge commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4' into froyo-plus-aosp
* commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4':
Add a new intent category used for activities running in carmode.
Merge commit '9c50996b175a1ee4b0069cba5163310c0189ac36' into froyo-plus-aosp
* commit '9c50996b175a1ee4b0069cba5163310c0189ac36':
Dont start wifi if in airplane mode
Now that wifi start is asynchronous
at the time of bring up, make sure
Wifi is not started if in airplane
mode.
Bug: 2567652
Change-Id: I947b7c8480029973bcbf028f6143aabbc88c9793
Merge commit '29039deea99a5529d92f7add3f9077ab247d3acd' into froyo-plus-aosp
* commit '29039deea99a5529d92f7add3f9077ab247d3acd':
Support another kind of iso mpeg4 file.
Merge commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e' into froyo-plus-aosp
* commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e':
Make desk mode work again.
