commit cb1c9fcc507737de4abc3d12fa56d439d5006a16
author Chalard Jean <jchalard@google.com> Wed Mar 25 02:23:03 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 25 02:23:03 2020 +0000
tree 0bf80affefd35256b80decc881d6c83bd2f6629f
parent 7a1edfc7e61c2c8169d85a9176dfc4a83ee426e5
parent dee287219f11d38fabb3293788e2be4242856c7d

Merge "Expose netId by adding getter API"

core/java/android/net/Network.java

diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java
index 2bac7a9..3d641f5 100644
--- a/core/java/android/net/Network.java
+++ b/core/java/android/net/Network.java
@@ -65,7 +65,7 @@
      * The unique id of the network.
      * @hide
      */
-    @SystemApi
+    @UnsupportedAppUsage
     public final int netId;
 
     // Objects used to perform per-network operations such as getSocketFactory
@@ -171,6 +171,17 @@
     }
 
     /**
+     * Get the unique id of the network.
+     *
+     * @hide
+     */
+    @TestApi
+    @SystemApi
+    public int getNetId() {
+        return netId;
+    }
+
+    /**
      * Returns a netid marked with the Private DNS bypass flag.
      *
      * This flag must be kept in sync with the NETID_USE_LOCAL_NAMESERVERS flag