| commit | be1810eddd749f2b6902f84bc2e87b24fa344998 | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Thu Dec 05 00:43:27 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 05 00:43:27 2019 -0800 |
| tree | f1b71f7fbc4980e77d663c1805acb25ca4b790ee | |
| parent | abebb560398854b750bb6133b351ba9388386ec2 [diff] | |
| parent | 25797f3843c6d1bf69883bf149790446e30e4552 [diff] |
Merge "Expose netId to SystemApi" am: ed2644bf65 am: 4127bbc6bf am: 25797f3843 Change-Id: I4dce3a699666c8f75e028b7dc2e196ca0b44b41c
diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java index 3f56def..f12ba13 100644 --- a/core/java/android/net/Network.java +++ b/core/java/android/net/Network.java
@@ -63,7 +63,7 @@ /** * @hide */ - @UnsupportedAppUsage + @SystemApi public final int netId; // Objects used to perform per-network operations such as getSocketFactory