Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mikhail Naganov
2015-05-14 20:43:04 +00:00
committed by Android (Google) Code Review
parent de355db3ec 6162eafe7a
commit 9355966878
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

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

2
api/system-current.txt
View File

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

5
core/java/android/webkit/WebResourceError.java
View File

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