Disable plugins if setPluginsEnabled(false) called.

tsaarni · tsaarni · commit 29086e46bedc · 2011-06-02T23:06:58.000+03:00
Old deprecated method for enabling/disabling plugins was
ignoring flag parameter and causing plugins always to be loaded.
Fixes issue 17242.

Change-Id: I1da10a3ee7f3041e59b43641169c3935a05aa347
Signed-off-by: Tero Saarni &lt;tero.saarni@gmail.com&gt;
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`	`/**`