Bug 957694 - Disable Flash on Tegra devices running KitKat r=blassey

This commit is contained in:
James Willcox 2014-01-24 08:50:47 -06:00
parent 30b89fa3e5
commit 32a6d15096

View File

@ -1958,7 +1958,8 @@ public class GeckoAppShell
static 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();
boolean isTegra = (new File("/system/lib/hw/gralloc.tegra.so")).exists() ||
(new File("/system/lib/hw/gralloc.tegra3.so")).exists();
if (isTegra) {
// disable Flash on Tegra ICS with CM9 and other custom firmware (bug 736421)
File vfile = new File("/proc/version");
@ -1986,6 +1987,12 @@ public class GeckoAppShell
// nothing
}
}
// disable on KitKat (bug 957694)
if (Build.VERSION.SDK_INT >= 19) {
Log.w(LOGTAG, "Blocking plugins because of Tegra (bug 957694)");
return null;
}
}
ArrayList<String> directories = new ArrayList<String>();