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

Commit d25fb8db authored by Kristian Monsen's avatar Kristian Monsen Committed by Android Git Automerger
Browse files

am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo 

Merge commit '34959e3f' into froyo-plus-aosp

* commit '34959e3f':
  Do not create intents for application/xhtml+xml
parents 210462e5 34959e3f

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,