am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."

* commit '258f32e2e3ff7f4f4b1395cae292098141047fde':
  Disable plugins if setPluginsEnabled(false) called.
This commit is contained in:
Romain Guy
2011-06-06 17:54:12 -07:00
committed by Android Git Automerger

View File

@@ -1052,7 +1052,7 @@ public class WebSettings {
*/ */
@Deprecated @Deprecated
public synchronized void setPluginsEnabled(boolean flag) { public synchronized void setPluginsEnabled(boolean flag) {
setPluginState(PluginState.ON); setPluginState(flag ? PluginState.ON : PluginState.OFF);
} }
/** /**