Merge "Disable plugins if setPluginsEnabled(false) called."

Romain Guy · Android Code Review · commit 258f32e2e3ff · 2011-06-06T16:23:25.000-07:00
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
@@ -1052,7 +1052,7 @@ public synchronized void setJavaScriptEnabled(boolean flag) {
      */
     @Deprecated
     public synchronized void setPluginsEnabled(boolean flag) {
-        setPluginState(PluginState.ON);
+        setPluginState(flag ? PluginState.ON : PluginState.OFF);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -1052,7 +1052,7 @@ public synchronized void setJavaScriptEnabled(boolean flag) {`
`1052`	`1052`	`*/`
`1053`	`1053`	`@Deprecated`
`1054`	`1054`	`public synchronized void setPluginsEnabled(boolean flag) {`
`1055`		`- setPluginState(PluginState.ON);`
	`1055`	`+ setPluginState(flag ? PluginState.ON : PluginState.OFF);`
`1056`	`1056`	`}`
`1057`	`1057`
`1058`	`1058`	`/**`