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

Merge "Expose netId to SystemApi"

Browse Source 
am: 1d379ac065

Change-Id: I930b421d373ac67ec5987b9440a45e6dbc536074
This commit is contained in:
markchien
2019-12-04 18:35:41 -08:00
committed by android-build-merger
parent 2000a1410f 1d379ac065
commit 1952cb5129
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -4194,6 +4194,7 @@ package android.net {
public class Network implements android.os.Parcelable { public class Network implements android.os.Parcelable {
ctor public Network(@NonNull android.net.Network); ctor public Network(@NonNull android.net.Network);
method @NonNull public android.net.Network getPrivateDnsBypassingCopy(); method @NonNull public android.net.Network getPrivateDnsBypassingCopy();
field public final int netId;
} }
public final class NetworkCapabilities implements android.os.Parcelable { public final class NetworkCapabilities implements android.os.Parcelable {

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

@@ -63,7 +63,7 @@ public class Network implements Parcelable {
/** /**
* @hide * @hide
*/ */
@UnsupportedAppUsage @SystemApi
public final int netId; public final int netId;
// Objects used to perform per-network operations such as getSocketFactory // Objects used to perform per-network operations such as getSocketFactory