Tiny fix after updating the error reporting API

Temporarily make WebResourceError.getDescription() non-abstract
so the current version of WebView doesn't crash on it.

Bug: 20064008, 21063767
Change-Id: I15a1abb5df76263006d14eb589fe0076d5aac582

diff --git a/api/current.txt b/api/current.txt
index fbb6554..f93d223 100644 (file)
--- a/api/current.txt
+++ b/api/current.txt
@@ -38808,7 +38808,7 @@ package android.webkit {
   }
 
   public abstract class WebResourceError {
-    method public abstract java.lang.CharSequence getDescription();
+    method public java.lang.CharSequence getDescription();
     method public abstract int getErrorCode();
   }
 

diff --git a/api/system-current.txt b/api/system-current.txt
index 07fb2d7..c0d9769 100644 (file)
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -41132,7 +41132,7 @@ package android.webkit {
 
   public abstract class WebResourceError {
     ctor public WebResourceError();
-    method public abstract java.lang.CharSequence getDescription();
+    method public java.lang.CharSequence getDescription();
     method public abstract int getErrorCode();
   }
 

diff --git a/core/java/android/webkit/WebResourceError.java b/core/java/android/webkit/WebResourceError.java
index 11f1b6f..90693f3 100644 (file)
--- a/core/java/android/webkit/WebResourceError.java
+++ b/core/java/android/webkit/WebResourceError.java
@@ -36,8 +36,11 @@ public abstract class WebResourceError {
      * and thus can be used for communicating the problem to the user.
      *
      * @return The description of the error
+     *
+     * Will become abstract after updated WebView.apk will be submitted
+     * into the Android tree.
      */
-    public abstract CharSequence getDescription();
+    public CharSequence getDescription() { return ""; }
 
     /**
      * This class can not be subclassed by applications.