diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-04-09 01:47:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-09 01:47:41 +0000 |
| commit | 448672dadae988251a13338b856b3c5ba8ab0bc8 (patch) | |
| tree | 881f82a8ab349fa8ce89222e1d55679c097f55ee | |
| parent | b4d44cfe7fef1eb0575fcf7cc3ae8e7ab7310fd9 (diff) | |
| parent | 226c9332af7a181a9145ba40c878fc25fdd5ac95 (diff) | |
| download | base-448672dadae988251a13338b856b3c5ba8ab0bc8.tar.gz | |
Merge "Set ParseException constructors as public" am: e067d9618c am: 226c9332af
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669051
Change-Id: I07fa3e87f4faff89f35b6a3500d3ccf0f5a10e94
3 files changed, 2 insertions, 10 deletions
diff --git a/packages/Connectivity/framework/api/current.txt b/packages/Connectivity/framework/api/current.txt index ab290f9d706a..7692e30c31fb 100644 --- a/packages/Connectivity/framework/api/current.txt +++ b/packages/Connectivity/framework/api/current.txt @@ -410,6 +410,8 @@ package android.net { } public class ParseException extends java.lang.RuntimeException { + ctor public ParseException(@NonNull String); + ctor public ParseException(@NonNull String, @NonNull Throwable); field public String response; } diff --git a/packages/Connectivity/framework/api/module-lib-current.txt b/packages/Connectivity/framework/api/module-lib-current.txt index 86b44acf9ed7..caf7f49efcd8 100644 --- a/packages/Connectivity/framework/api/module-lib-current.txt +++ b/packages/Connectivity/framework/api/module-lib-current.txt @@ -133,11 +133,6 @@ package android.net { method @NonNull public android.net.NetworkRequest.Builder setUids(@Nullable java.util.Set<android.util.Range<java.lang.Integer>>); } - public class ParseException extends java.lang.RuntimeException { - ctor public ParseException(@NonNull String); - ctor public ParseException(@NonNull String, @NonNull Throwable); - } - public final class TcpRepairWindow { ctor public TcpRepairWindow(int, int, int, int, int, int); field public final int maxWindow; diff --git a/packages/Connectivity/framework/src/android/net/ParseException.java b/packages/Connectivity/framework/src/android/net/ParseException.java index ca6d012dfe7c..9d4727a84bc0 100644 --- a/packages/Connectivity/framework/src/android/net/ParseException.java +++ b/packages/Connectivity/framework/src/android/net/ParseException.java @@ -17,7 +17,6 @@ package android.net; import android.annotation.NonNull; -import android.annotation.SystemApi; /** * Thrown when parsing failed. @@ -26,15 +25,11 @@ import android.annotation.SystemApi; public class ParseException extends RuntimeException { public String response; - /** @hide */ - @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public ParseException(@NonNull String response) { super(response); this.response = response; } - /** @hide */ - @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public ParseException(@NonNull String response, @NonNull Throwable cause) { super(response, cause); this.response = response; |