summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTero Saarni <tero.saarni@gmail.com>2011-06-02 21:05:38 +0300
committerTero Saarni <tero.saarni@gmail.com>2011-06-02 23:06:58 +0300
commit29086e46bedc145ebd34dc99538f61af8a2cdc5a (patch)
treebaeba0905b5c8a81de640c457a388bf5c735f800
parent94062517ae5573f9a1a877a83fe7d8e6d1a2c350 (diff)
downloadframeworks_base-29086e46bedc145ebd34dc99538f61af8a2cdc5a.zip
frameworks_base-29086e46bedc145ebd34dc99538f61af8a2cdc5a.tar.gz
frameworks_base-29086e46bedc145ebd34dc99538f61af8a2cdc5a.tar.bz2
Disable plugins if setPluginsEnabled(false) called.
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 <tero.saarni@gmail.com>
-rw-r--r--core/java/android/webkit/WebSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 89e25e8..a82b7b8 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -1052,7 +1052,7 @@ public class WebSettings {
*/
@Deprecated
public synchronized void setPluginsEnabled(boolean flag) {
- setPluginState(PluginState.ON);
+ setPluginState(flag ? PluginState.ON : PluginState.OFF);
}
/**