diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-04-09 10:59:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-09 10:59:20 -0700 |
| commit | 34959e3fe87012d554af07fd6ad294b2ce3daea7 (patch) | |
| tree | 7c54736456662a01d6d3854bf1331119a5fe92c9 /core/java/android/webkit | |
| parent | e67e6b94fd282283f1ffa2299fae536bee099715 (diff) | |
| parent | e9a2fe013d9d3bb04ccbe665c54337bfa1880012 (diff) | |
| download | frameworks_base-34959e3fe87012d554af07fd6ad294b2ce3daea7.zip frameworks_base-34959e3fe87012d554af07fd6ad294b2ce3daea7.tar.gz frameworks_base-34959e3fe87012d554af07fd6ad294b2ce3daea7.tar.bz2 | |
Merge "Do not create intents for application/xhtml+xml" into froyo
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/LoadListener.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/webkit/LoadListener.java b/core/java/android/webkit/LoadListener.java index 1130e95..12b8c74 100644 --- a/core/java/android/webkit/LoadListener.java +++ b/core/java/android/webkit/LoadListener.java @@ -380,7 +380,8 @@ class LoadListener extends Handler implements EventHandler { } // At this point, mMimeType has been set to non-null. if (mIsMainPageLoader && mIsMainResourceLoader && mUserGesture && - Pattern.matches(XML_MIME_TYPE, mMimeType)) { + Pattern.matches(XML_MIME_TYPE, mMimeType) && + !mMimeType.equalsIgnoreCase("application/xhtml+xml")) { Intent i = new Intent(Intent.ACTION_VIEW); i.setDataAndType(Uri.parse(url()), mMimeType); ResolveInfo info = mContext.getPackageManager().resolveActivity(i, |