diff options
| author | 2019-12-04 18:39:46 -0800 | |
|---|---|---|
| committer | 2019-12-04 18:39:46 -0800 | |
| commit | 1d87d9b7849812bb5626272c43cc055887228bab (patch) | |
| tree | 9919a8c2dfbe0bb03e6f3618d6ccee3068414cbb | |
| parent | 9b115791e51359f2eeba8a2e57afca99831977b6 (diff) | |
| parent | 1952cb5129ae4c7ef1bcb7c9823491c8b85ae37c (diff) | |
Merge "Expose netId to SystemApi" am: 1d379ac065
am: 1952cb5129
Change-Id: I23f6428954d08761d9671b419887d58dd29171fd
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/net/Network.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 9f8af7f768bc..724f4e21030c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4194,6 +4194,7 @@ package android.net { public class Network implements android.os.Parcelable { ctor public Network(@NonNull android.net.Network); method @NonNull public android.net.Network getPrivateDnsBypassingCopy(); + field public final int netId; } public final class NetworkCapabilities implements android.os.Parcelable { diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java index 3f56def6d7d5..f12ba1367d98 100644 --- a/core/java/android/net/Network.java +++ b/core/java/android/net/Network.java @@ -63,7 +63,7 @@ public class Network implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @SystemApi public final int netId; // Objects used to perform per-network operations such as getSocketFactory |