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
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();
}
/**