From e9a2fe013d9d3bb04ccbe665c54337bfa1880012 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Fri, 9 Apr 2010 18:34:07 +0100
Subject: [PATCH] Do not create intents for application/xhtml+xml

Fix for b 2584681, webview opens contents in browser.

Change-Id: I314e808a65f3c2043bd7bc7fcd44ac071f136bdc
---
 core/java/android/webkit/LoadListener.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/webkit/LoadListener.java b/core/java/android/webkit/LoadListener.java
index 1130e950780eb..12b8c74dd3716 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,