Merge change Ibb245ea7 into eclair

* changes: Return an empty PluginList instead of null for the deprecated getPluginList() api.
2009-11-11 14:34:05 -08:00
parent 2f92bd3ecb bb245ea7f5
commit c996689109
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2730,7 +2730,7 @@ public class WebView extends AbsoluteLayout
    */
    @Deprecated
    public static synchronized PluginList getPluginList() {
-        return null;
+        return new PluginList();
    }

   /**