Merge commit '70c4f6cfb4fd48d5153080d038ac0f5b6dbd98ec'
* commit '70c4f6cfb4fd48d5153080d038ac0f5b6dbd98ec':
Add a static method to obtain the mime type from extension.
Merge commit '021b7b443fa4bb24ec73d0c09cf019c14eba67bc' into eclair-mr2-plus-aosp
* commit '021b7b443fa4bb24ec73d0c09cf019c14eba67bc':
Add a static method to obtain the mime type from extension.
The MOBILE_MMS, MOBILE_SUPL, MOBILE_DUN and MOBILE_HIPRI net types used
by location, messaging, and vending needed to be exposed.
Bug: 2363272
Change-ID: I6d2361d3642064db619b283b9217512563eb3439
Merge commit 'ace8addce47efc03be5038eef48d7fb066b14aae'
* commit 'ace8addce47efc03be5038eef48d7fb066b14aae':
Create a new ImeOption that disables fullscreen in landscape, and use it.
Merge commit '2edd68260f26cbd6eddd0df16404bb6bcb22b3b6' into eclair-mr2-plus-aosp
* commit '2edd68260f26cbd6eddd0df16404bb6bcb22b3b6':
Create a new ImeOption that disables fullscreen in landscape, and use it.
EditorInfo:
Add a flag to tell the InputMethodService to never go into fullscreen
mode.
InputMethodService:
When the new flag is set, onEvaluateFullscreenMode always returns
false.
WebTextView:
Use the new flag, along with IME_FLAG_NO_EXTRACT_UI. Fixes
http://b/issue?id=2358360
- Moved DomainNameChecker from android.net.http to android common, and renamed to DomainNameValidator.
- Added a simplified version of DNParser, which DomainNameValidator uses instead of X509Name in order to extract Subject Name from a certificate.
- Added unit tests for DomainNameChecker and DNParser.
There's a suspicious comment in DomainNameChecker saying something like "X509Certificate fails to parse a certificate when a subject alt name begins with '*'". I think we should fix it if it's really the case -- otherwise certificates with the wildcard wouldn't work. I'll see if it's true after submitting this patch.
Merge commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0' into eclair-plus-aosp
* commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0':
framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
Couple of tweak for multi-touch in WebView.
1. If we can't zoom, don't get in multitouch mode.
This avoid the logo in google.com looks fuzzy.
2. Reset mAnchor after sending VIEW_SIZE_CHANGED.
3. Don't call zoom when finishing multitouch unless
zoom is called before.
4. Change the width for nativeSetSize, which was modified
in the last check-in. The new logic should make both
msn.com and news.google.com looks correct.
5. Use the pressure instead of distance/time to filter
out the jitter just before lifting the finger.
Fix http://b/issue?id=2360032
Rebuild the nav cache in the webkit thread after determining
that the clicked on node isn't valid. Remove old code that
passed a flag to avoid using the invalid node, since it
should always be valid now.
requires a companion fix in external/webkit
fixes http://b/2362334
Eliminate the per-process 200ms timeout during ANR thread-dumping.
Dump all the threads at once, then wait for the file to stabilize.
Seems to work great and is much, much, much faster.
Don't dump stack traces to traces.txt on app crashes (it isn't very
useful and mostly just clutters up the file).
Tweak the formatting of the dropbox dumpsys a bit, for readability,
and avoid running out of memory when dumping large log files.
Report build & kernel version with kernel log dropbox entries.
Merge commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp
* commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e':
Don't set priority in Bonding state.
Merge commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f'
* commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f':
consolidating to only use one surface per plugin. give plugin access to java context.
Merge commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db' into eclair-mr2-plus-aosp
* commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db':
consolidating to only use one surface per plugin. give plugin access to java context.
Merge commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d'
* commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d':
javadoc change: fix the selector sample XML in the class