Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 993a0f70 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android Git Automerger
Browse files

am 93559668: Merge "Tiny fix after updating the error reporting API" into mnc-dev 

* commit '93559668':
  Tiny fix after updating the error reporting API
parents 487e1655 93559668

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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();















  }







































api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -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();















  }







































core/java/android/webkit/WebResourceError.java



+4
−1




























Original line number
Diff line number
Diff line








@@ -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.