From b6858e591968dbd94a8c4f2c5068747fd58e1b6d Mon Sep 17 00:00:00 2001
From: markchien <markchien@google.com>
Date: Wed, 18 Mar 2020 08:43:07 +0800
Subject: [PATCH] Expose netId by adding getter API

Bug: 151156820
Test: m
      atest TetetheringTests

Clean CP from ag/10747732

Change-Id: Ieb1483c146aa2f7d8f251157e6e81d71c44ae899
Merged-In: Ieb1483c146aa2f7d8f251157e6e81d71c44ae899
---
 api/system-current.txt                              |  2 +-
 api/test-current.txt                                |  1 +
 core/java/android/net/Network.java                  | 13 ++++++++++++-
 .../server/connectivity/tethering/Tethering.java    |  2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 31b5b0ed65f6a..4aa459325cd76 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4540,8 +4540,8 @@ package android.net {
 
   public class Network implements android.os.Parcelable {
     ctor public Network(@NonNull android.net.Network);
+    method public int getNetId();
     method @NonNull public android.net.Network getPrivateDnsBypassingCopy();
-    field public final int netId;
   }
 
   public abstract class NetworkAgent {
diff --git a/api/test-current.txt b/api/test-current.txt
index b95cb1d8eaa3c..6195fde454585 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -1507,6 +1507,7 @@ package android.net {
 
   public class Network implements android.os.Parcelable {
     ctor public Network(@NonNull android.net.Network);
+    method public int getNetId();
     method @NonNull public android.net.Network getPrivateDnsBypassingCopy();
   }
 
diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java
index 2bac7a97b717a..3d641f5a0029c 100644
--- a/core/java/android/net/Network.java
+++ b/core/java/android/net/Network.java
@@ -65,7 +65,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
@@ -170,6 +170,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.
      *
diff --git a/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java b/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
index 3dcc15f92c068..8cf651b777a29 100644
--- a/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
+++ b/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
@@ -1494,7 +1494,7 @@ public class Tethering {
             } else {
                 dnsServers = mConfig.defaultIPv4DNS;
             }
-            final int netId = (network != null) ? network.netId : NETID_UNSET;
+            final int netId = (network != null) ? network.getNetId() : NETID_UNSET;
             try {
                 mNetd.tetherDnsSet(netId, dnsServers);
                 mLog.log(String.format(