Fix NPE in addMessageToConsole.

CallbackProxy should always check for client during handleMessage.

Bug: 3060412
Change-Id: I0a84fa2ce21cc46d9b215b18a700119c7c12a7f2

1 files changed, 6 insertions, 1 deletions

diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java
index b00f88cbf85e..8c9f266b6d55 100644
--- a/core/java/android/webkit/CallbackProxy.java
+++ b/core/java/android/webkit/CallbackProxy.java
@@ -710,6 +710,9 @@ class CallbackProxy extends Handler {
                 break;
 
             case ADD_MESSAGE_TO_CONSOLE:
+                if (mWebChromeClient == null) {
+                    break;
+                }
                 String message = msg.getData().getString("message");
                 String sourceID = msg.getData().getString("sourceID");
                 int lineNumber = msg.getData().getInt("lineNumber");
@@ -786,7 +789,9 @@ class CallbackProxy extends Handler {
                         host, realm, username, password);
                 break;
             case SET_INSTALLABLE_WEBAPP:
-                mWebChromeClient.setInstallableWebApp();
+                if (mWebChromeClient != null) {
+                    mWebChromeClient.setInstallableWebApp();
+                }
                 break;
         }
     }