Merge "Expose netId by adding getter API" into rvc-dev

core/java/android/net/Network.java

@@ -64,7 +64,7 @@ public class Network implements Parcelable {
      * The unique id of the network.
      * @hide
      */
-    @SystemApi
+    @UnsupportedAppUsage
     public final int netId;
 
     // Objects used to perform per-network operations such as getSocketFactory
@@ -169,6 +169,17 @@ public class Network implements Parcelable {
         return new Network(netId, true);
     }
 
+    /**
+     * 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.
      *