From ed3ff7124c76df25ab2562ee8c0003bef4dbee7d Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@dougt.org>
Date: Wed, 9 Feb 2011 13:51:23 -0800
Subject: [PATCH] Bug 630364 - followup to preserve mime info.  external
 application handlers do not honor warning preferences. android-only
 r=blassey. a=blocking-fennec

---
 uriloader/exthandler/android/nsMIMEInfoAndroid.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp b/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp
index daf68103cf1..bfa71f7a6ee 100644
--- a/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp
+++ b/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp
@@ -57,9 +57,12 @@ nsMIMEInfoAndroid::LoadUriInternal(nsIURI * aURI)
   nsCString uriSpec;
   aURI->GetSpec(uriSpec);
 
+  nsCString uriScheme;
+  aURI->GetScheme(uriScheme);
+
   if (mozilla::AndroidBridge::Bridge())
     return mozilla::AndroidBridge::Bridge()->
-      OpenUriExternal(uriSpec, EmptyCString()) ? NS_OK : NS_ERROR_FAILURE;
+      OpenUriExternal(uriSpec, mType.Equals(uriScheme) ? EmptyCString() : mType) ? NS_OK : NS_ERROR_FAILURE;
 
   return NS_ERROR_FAILURE;
 }