Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '34959e3fe87012d554af07fd6ad294b2ce3daea7' into froyo-plus-aosp

* commit '34959e3fe87012d554af07fd6ad294b2ce3daea7':
  Do not create intents for application/xhtml+xml
This commit is contained in:
Kristian Monsen
2010-04-10 11:41:14 -07:00
committed by Android Git Automerger
parent 210462e577 34959e3fe8
commit d25fb8db8d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/webkit/LoadListener.java
View File

@@ -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,