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

Commit 4bd5b588 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Tethering: Fix hidden API selectBestRoute" am: 385c17e1 

Change-Id: I0f9d17f00da1b7aa31e9439036ba874427b1df75
parents a3eb43a2 385c17e1

packages/Tethering/Android.bp

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

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

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

    }