Bug 935676 - Always try to reload invlalid plugins on Android. r=jaas, a=bajaj
authorJames Willcox <snorp@snorp.net>
Wed, 15 Jan 2014 09:16:40 -0600
changeset 174879 448e768c4038accd4743e5eb6ef94d0de030eebc
parent 174878 a30a7a20eaf43db68b290135b7aa1246a10c6316
child 174880 b9c88092379c22fd4bcf84f68340b7894e839f3c
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaas, bajaj
bugs935676
milestone28.0a2
Bug 935676 - Always try to reload invlalid plugins on Android. r=jaas, a=bajaj
dom/plugins/base/nsPluginHost.cpp
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -2628,16 +2628,18 @@ nsPluginHost::ReadPluginInfo()
     }
 
     PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_BASIC,
       ("LoadCachedPluginsInfo : Loading Cached plugininfo for %s\n", tag->mFileName.get()));
     tag->mNext = mCachedPlugins;
     mCachedPlugins = tag;
   }
 
+// On Android we always want to try to load a plugin again (Flash). Bug 935676.
+#ifndef MOZ_WIDGET_ANDROID
   if (hasInvalidPlugins) {
     if (!ReadSectionHeader(reader, "INVALID")) {
       return rv;
     }
 
     while (reader.NextLine()) {
       const char *fullpath = reader.LinePtr();
       if (!reader.NextLine()) {
@@ -2651,16 +2653,17 @@ nsPluginHost::ReadPluginInfo()
 
       invalidTag->mNext = mInvalidPlugins;
       if (mInvalidPlugins) {
         mInvalidPlugins->mPrev = invalidTag;
       }
       mInvalidPlugins = invalidTag;
     }
   }
+#endif
 
   // flip the pref so we don't import the legacy flags again
   Preferences::SetBool("plugin.importedState", true);
 
   return NS_OK;
 }
 
 void