diff options
| author | Romain Guy <romainguy@android.com> | 2011-06-09 09:03:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-09 09:03:55 -0700 |
| commit | 0fbf20703f02836073567e9ad3bae401be8b3efc (patch) | |
| tree | 3ac28f7a7107fbe6f5e8fe3fce1a6b430f496f39 /core/java/android/webkit/WebSettings.java | |
| parent | 604d7fe79974b5c520508c79790a9ef272712642 (diff) | |
| parent | 34e9f249a9b36ebe64476b997bca0edf990fbc0d (diff) | |
| download | frameworks_base-0fbf20703f02836073567e9ad3bae401be8b3efc.zip frameworks_base-0fbf20703f02836073567e9ad3bae401be8b3efc.tar.gz frameworks_base-0fbf20703f02836073567e9ad3bae401be8b3efc.tar.bz2 | |
am 34e9f249: am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
* commit '34e9f249a9b36ebe64476b997bca0edf990fbc0d':
Disable plugins if setPluginsEnabled(false) called.
Diffstat (limited to 'core/java/android/webkit/WebSettings.java')
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 66fcc27..c361a4a 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -1234,7 +1234,7 @@ public class WebSettings { */ @Deprecated public synchronized void setPluginsEnabled(boolean flag) { - setPluginState(PluginState.ON); + setPluginState(flag ? PluginState.ON : PluginState.OFF); } /** |