commit 3cd41e4922ac5c7547aed9225fa4d3bbaaf74937
author Grace Kloba <klobag@google.com> Wed Nov 11 14:37:33 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 11 14:37:33 2009 -0800
tree 4356b1e45089bc54a8907bf16ab471f8d83b6cc9
parent 8194ee097093b6f28bba36d2903a08debdf30f18
parent c996689109b1ac0849aa675e1987e3851ee77a95

am c9966891: Merge change Ibb245ea7 into eclair

Merge commit 'c996689109b1ac0849aa675e1987e3851ee77a95' into eclair-plus-aosp

* commit 'c996689109b1ac0849aa675e1987e3851ee77a95':
  Return an empty PluginList instead of null for the

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 142dffb..06e3e73 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2730,7 +2730,7 @@
     */
     @Deprecated
     public static synchronized PluginList getPluginList() {
-        return null;
+        return new PluginList();
     }
 
    /**