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

* commit 'fbef58faad5a31faf36294e4d160cbd148ed5458':
  Disable plugins if setPluginsEnabled(false) called.
This commit is contained in:
Romain Guy
2011-06-07 15:09:02 -07:00
committed by Android Git Automerger

View File

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