Merge "Tethering: Fix hidden API selectBestRoute"

This commit is contained in:
Remi NGUYEN VAN
2020-01-31 07:40:16 +00:00
committed by Gerrit Code Review
2 changed files with 4 additions and 1 deletions

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",

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;
}