| commit | bafe3cfffb6ae9e76f11a32cadabd868bdf5afaa | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Wed Dec 04 18:39:46 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 04 18:39:46 2019 -0800 |
| tree | 2d4debfd3bad78be5fe816b740ef524e07904b76 | |
| parent | 638ce2d8ca688198dd6e26ea2da3e9e0f7a15861 [diff] | |
| parent | bd154aca0cfd07e90f93d8b72871c331e23b4785 [diff] |
Merge "Expose netId to SystemApi" am: cec4a7df3a am: bd154aca0c Change-Id: I23f6428954d08761d9671b419887d58dd29171fd
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