summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authormarkchien <markchien@google.com>2019-12-05 00:43:27 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-12-05 00:43:27 -0800
commit6d32634b8ac156b01de54fc0ffaed561df477500 (patch)
tree6290eb55dd772936061428527f719c6feac9c6e3 /core/java/android
parent4ff3397343f7601d79a7173cbfd399f1480bbd7c (diff)
parent1d87d9b7849812bb5626272c43cc055887228bab (diff)
Merge "Expose netId to SystemApi" am: 1d379ac065 am: 1952cb5129
am: 1d87d9b784 Change-Id: I4dce3a699666c8f75e028b7dc2e196ca0b44b41c
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/Network.java2
1 files changed, 1 insertions, 1 deletions
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