Merge "Update WebView.addJavascriptInterface() to ignore null instances"

1 files changed, 6 insertions, 2 deletions

diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java
index 9568e4f..8f92458 100644
--- a/core/java/android/webkit/BrowserFrame.java
+++ b/core/java/android/webkit/BrowserFrame.java
@@ -571,8 +571,11 @@ class BrowserFrame extends Handler {
             Iterator iter = mJSInterfaceMap.keySet().iterator();
             while (iter.hasNext())  {
                 String interfaceName = (String) iter.next();
-                nativeAddJavascriptInterface(nativeFramePointer,
-                        mJSInterfaceMap.get(interfaceName), interfaceName);
+                Object object = mJSInterfaceMap.get(interfaceName);
+                if (object != null) {
+                    nativeAddJavascriptInterface(nativeFramePointer,
+                            mJSInterfaceMap.get(interfaceName), interfaceName);
+                }
             }
         }
     }
@@ -595,6 +598,7 @@ class BrowserFrame extends Handler {
     }
 
     public void addJavascriptInterface(Object obj, String interfaceName) {
+        assert obj != null;
         if (mJSInterfaceMap == null) {
             mJSInterfaceMap = new HashMap<String, Object>();
         }