Bug 777746 - Don't block Flash for Tegra on Gingerbread/Froyo r=blassey a=lsblakk
authorJames Willcox <jwillcox@mozilla.com>
Fri, 10 Aug 2012 13:02:54 -0400
changeset 100476 375f160230b3683796e436a68093c27e14130a7c
parent 100475 5aab567a4390be42a842fd29c1a982ced666cb7b
child 100477 3bb3b14f262a0f3559b922484b228b1f44141f26
push id1259
push userjwillcox@mozilla.com
push dateFri, 10 Aug 2012 19:35:32 +0000
treeherdermozilla-beta@375f160230b3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey, lsblakk
bugs777746
milestone15.0
Bug 777746 - Don't block Flash for Tegra on Gingerbread/Froyo r=blassey a=lsblakk
mobile/android/base/GeckoApp.java
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -189,22 +189,16 @@ abstract public class GeckoApp
     public ArrayList<PackageInfo> mPackageInfoCache = new ArrayList<PackageInfo>();
 
     // Returns null if plugins are blocked on the device.
     String[] getPluginDirectories() {
 
         // An awful hack to detect Tegra devices. Easiest way to do it without spinning up a EGL context.
         boolean isTegra = (new File("/system/lib/hw/gralloc.tegra.so")).exists();
         if (isTegra) {
-            // disable Flash on pre-HC Tegra (bug 703056)
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
-                Log.w(LOGTAG, "Blocking plugins because of Tegra 2 + Gingerbread bug");
-                return null;
-            }
-
             // disable Flash on Tegra ICS with CM9 and other custom firmware (bug 736421)
             File vfile = new File("/proc/version");
             FileReader vreader = null;
             try {
                 if (vfile.canRead()) {
                     vreader = new FileReader(vfile);
                     String version = new BufferedReader(vreader).readLine();
                     if (version.indexOf("CM9") != -1 ||