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

Merge "API review: make exception class and Builder final" into rvc-dev am: 9c9366b2df am: 59c7b6faf8 am: cc6d0a73a4

Browse Source 
Change-Id: Ie872d1f9c7c9d39e8350a484466871cc9cc216ac
This commit is contained in:
Aaron Huang
2020-03-25 10:11:00 +00:00
committed by Automerger Merge Worker
parent 434ed26b70 cc6d0a73a4
commit 1643ca374f
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -6061,7 +6061,7 @@ package android.net {
method public void release(); method public void release();
} }
public class InvalidPacketException extends java.lang.Exception { public final class InvalidPacketException extends java.lang.Exception {
ctor public InvalidPacketException(int); ctor public InvalidPacketException(int);
method public int getError(); method public int getError();
field public static final int ERROR_INVALID_IP_ADDRESS = -21; // 0xffffffeb field public static final int ERROR_INVALID_IP_ADDRESS = -21; // 0xffffffeb
@@ -6255,7 +6255,7 @@ package android.net {
field public static final int NET_CAPABILITY_PARTIAL_CONNECTIVITY = 24; // 0x18 field public static final int NET_CAPABILITY_PARTIAL_CONNECTIVITY = 24; // 0x18
} }
public static class NetworkCapabilities.Builder { public static final class NetworkCapabilities.Builder {
ctor public NetworkCapabilities.Builder(); ctor public NetworkCapabilities.Builder();
ctor public NetworkCapabilities.Builder(@NonNull android.net.NetworkCapabilities); ctor public NetworkCapabilities.Builder(@NonNull android.net.NetworkCapabilities);
method @NonNull public android.net.NetworkCapabilities.Builder addCapability(int); method @NonNull public android.net.NetworkCapabilities.Builder addCapability(int);

2
api/test-current.txt
View File

@@ -1833,7 +1833,7 @@ package android.net {
field public static final int TRANSPORT_TEST = 7; // 0x7 field public static final int TRANSPORT_TEST = 7; // 0x7
} }
public static class NetworkCapabilities.Builder { public static final class NetworkCapabilities.Builder {
ctor public NetworkCapabilities.Builder(); ctor public NetworkCapabilities.Builder();
ctor public NetworkCapabilities.Builder(@NonNull android.net.NetworkCapabilities); ctor public NetworkCapabilities.Builder(@NonNull android.net.NetworkCapabilities);
method @NonNull public android.net.NetworkCapabilities.Builder addCapability(int); method @NonNull public android.net.NetworkCapabilities.Builder addCapability(int);

2
core/java/android/net/InvalidPacketException.java
View File

@@ -27,7 +27,7 @@ import java.lang.annotation.RetentionPolicy;
* @hide * @hide
*/ */
@SystemApi @SystemApi
public class InvalidPacketException extends Exception { public final class InvalidPacketException extends Exception {
private final int mError; private final int mError;
// Must match SocketKeepalive#ERROR_INVALID_IP_ADDRESS. // Must match SocketKeepalive#ERROR_INVALID_IP_ADDRESS.

2
core/java/android/net/NetworkCapabilities.java
View File

@@ -2000,7 +2000,7 @@ public final class NetworkCapabilities implements Parcelable {
*/ */
@SystemApi @SystemApi
@TestApi @TestApi
public static class Builder { public static final class Builder {
private final NetworkCapabilities mCaps; private final NetworkCapabilities mCaps;
/** /**