diff options
| author | Grace Kloba <klobag@google.com> | 2009-11-11 17:13:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-11 17:13:57 -0800 |
| commit | 09550fde489a6d5155f005fec9b328f1b2a878a6 (patch) | |
| tree | ce8943bd1b8c1bf4463cf7e7d4520153c9beb920 /core/java | |
| parent | 052908a5d93f3d842cd7a9d8eda5acd3d9565b69 (diff) | |
| parent | c996689109b1ac0849aa675e1987e3851ee77a95 (diff) | |
| download | frameworks_base-09550fde489a6d5155f005fec9b328f1b2a878a6.zip frameworks_base-09550fde489a6d5155f005fec9b328f1b2a878a6.tar.gz frameworks_base-09550fde489a6d5155f005fec9b328f1b2a878a6.tar.bz2 | |
am c9966891: Merge change Ibb245ea7 into eclair
Merge commit 'c996689109b1ac0849aa675e1987e3851ee77a95' into eclair-mr2
* commit 'c996689109b1ac0849aa675e1987e3851ee77a95':
Return an empty PluginList instead of null for the
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 9999573..5fd6a6c 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2801,7 +2801,7 @@ public class WebView extends AbsoluteLayout */ @Deprecated public static synchronized PluginList getPluginList() { - return null; + return new PluginList(); } /** |