Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tethering: Fix hidden API selectBestRoute" am: 385c17e1c9 am: 4bd5b588b0

Browse Source 
Change-Id: I7663dcc98fd600f08e079d716679a532e78b915a
This commit is contained in:
Automerger Merge Worker
2020-01-31 16:45:37 +00:00
parent b2c73ad09a 4bd5b588b0
commit bb3fc0b544
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/Tethering/Android.bp
View File

@@ -29,6 +29,7 @@ java_defaults {
"netlink-client",
"networkstack-aidl-interfaces-unstable-java",
"android.hardware.tetheroffload.control-V1.0-java",
"net-utils-framework-common",
],
libs: [
"framework-tethering",

4
packages/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java
View File

@@ -22,6 +22,8 @@ import android.net.NetworkCapabilities;
import android.net.RouteInfo;
import android.net.util.InterfaceSet;
import com.android.net.module.util.NetUtils;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -85,7 +87,7 @@ public final class TetheringInterfaceUtils {
private static String getInterfaceForDestination(LinkProperties lp, InetAddress dst) {
final RouteInfo ri = (lp != null)
? RouteInfo.selectBestRoute(lp.getAllRoutes(), dst)
? NetUtils.selectBestRoute(lp.getAllRoutes(), dst)
: null;
return (ri != null) ? ri.getInterface() : null;
}