summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/BrowserFrame.java
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2009-11-30 13:34:40 -0500
committerPatrick Scott <phanna@android.com>2009-12-04 13:19:52 -0500
commit7c24ed6904707ea7179cb81382b7ca8d8ce85b7f (patch)
tree321085c5eb4d429a430ab9f8860056057eccd8c6 /core/java/android/webkit/BrowserFrame.java
parentd345c6acedb22c9408553ef9f38c196984177e6b (diff)
downloadframeworks_base-7c24ed6904707ea7179cb81382b7ca8d8ce85b7f.zip
frameworks_base-7c24ed6904707ea7179cb81382b7ca8d8ce85b7f.tar.gz
frameworks_base-7c24ed6904707ea7179cb81382b7ca8d8ce85b7f.tar.bz2
Check if another Activity wants to intercept an xml mime type.
WebCore treats */*+xml as content that it can render. This prevents Activities from intercepting those mime types. Check the same regular expression as DOMImplementation and then use the PackageManager to look for a matching Activity. Requires a change to webcore. Bug: 2256744
Diffstat (limited to 'core/java/android/webkit/BrowserFrame.java')
-rw-r--r--core/java/android/webkit/BrowserFrame.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java
index 1496f1b..e94f485 100644
--- a/core/java/android/webkit/BrowserFrame.java
+++ b/core/java/android/webkit/BrowserFrame.java
@@ -546,6 +546,8 @@ class BrowserFrame extends Handler {
byte[] postData,
long postDataIdentifier,
int cacheMode,
+ boolean mainResource,
+ boolean userGesture,
boolean synchronous) {
PerfChecker checker = new PerfChecker();
@@ -612,13 +614,14 @@ class BrowserFrame extends Handler {
if (DebugFlags.BROWSER_FRAME) {
Log.v(LOGTAG, "startLoadingResource: url=" + url + ", method="
+ method + ", postData=" + postData + ", isMainFramePage="
- + isMainFramePage);
+ + isMainFramePage + ", mainResource=" + mainResource
+ + ", userGesture=" + userGesture);
}
// Create a LoadListener
LoadListener loadListener = LoadListener.getLoadListener(mContext,
this, url, loaderHandle, synchronous, isMainFramePage,
- postDataIdentifier);
+ mainResource, userGesture, postDataIdentifier);
mCallbackProxy.onLoadResource(url);