From 38d3b2c9f0d8400033aad538b09f2e7b01b6efd9 Mon Sep 17 00:00:00 2001 From: markchien Date: Tue, 14 Jan 2020 17:28:47 +0800 Subject: [PATCH] Tethering: Fix hidden API selectBestRoute Bug: 143925787 Test: -build, flash, boot -ON/OFF hotspot -atest TetheringTests Change-Id: I824a05fac8b606123667d20ab9b1f7de905e4088 --- packages/Tethering/Android.bp | 1 + .../connectivity/tethering/TetheringInterfaceUtils.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/Tethering/Android.bp b/packages/Tethering/Android.bp index d297f3f841890..5bad24ac56194 100644 --- a/packages/Tethering/Android.bp +++ b/packages/Tethering/Android.bp @@ -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", diff --git a/packages/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java b/packages/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java index d5cdd8a004dcd..4dd68301f9fab 100644 --- a/packages/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java +++ b/packages/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java @@ -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; }