Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34959e3f authored by Kristian Monsen's avatar Kristian Monsen Committed by Android (Google) Code Review
Browse files

Merge "Do not create intents for application/xhtml+xml" into froyo

parents e67e6b94 e9a2fe01

core/java/android/webkit/LoadListener.java

+2 −1
Original line number Diff line number Diff line
@@ -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,