Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6858e59 authored by markchien's avatar markchien Committed by Chalard Jean
Browse files

Expose netId by adding getter API 

Bug: 151156820
Test: m
      atest TetetheringTests

Clean CP from ag/10747732

Change-Id: Ieb1483c146aa2f7d8f251157e6e81d71c44ae899
Merged-In: Ieb1483c146aa2f7d8f251157e6e81d71c44ae899
parent 6982a7dc

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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 {

































api/test-current.txt



+1
−0






























Original line number
Diff line number
Diff line








@@ -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();















  }

















































core/java/android/net/Network.java



+12
−1






























Original line number
Diff line number
Diff line








@@ -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.















     *

































packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java



+1
−1






























Original line number
Diff line number
Diff line








@@ -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(