Merge "Ensure that the description in onReceivedError is not null." into master-chromium

1 files changed, 7 insertions, 0 deletions

diff --git a/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java b/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
index 682bd67..9201798 100644
--- a/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
+++ b/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Picture;
+import android.net.http.ErrorStrings;
 import android.net.http.SslError;
 import android.os.Handler;
 import android.os.Looper;
@@ -403,6 +404,12 @@ public class WebViewContentsClientAdapter extends AwContentsClient {
      */
     @Override
     public void onReceivedError(int errorCode, String description, String failingUrl) {
+        if (description == null || description.isEmpty()) {
+            // ErrorStrings is @hidden, so we can't do this in AwContents.
+            // Normally the net/ layer will set a valid description, but for synthesized callbacks
+            // (like in the case for intercepted requests) AwContents will pass in null.
+            description = ErrorStrings.getString(errorCode, mWebView.getContext());
+        }
         mWebViewClient.onReceivedError(mWebView, errorCode, description, failingUrl);
     }