From 698a57c268b71f229231655e24b0478fdd351dce Mon Sep 17 00:00:00 2001
From: Taras Antoshchuk <tantoshchuk@google.com>
Date: Mon, 2 Aug 2021 18:19:55 +0200
Subject: [PATCH] Explicitly check route type in NetworkDiagnostics

LinkProperties.getRoutes() can now return throw routes as well so we
need to check the route type before consuming it if we only intend to
use unicast routes.

Test: none
Bug: 186082280
Change-Id: I2a35170f8002a16c49584c7f85cd02f0c34f35b0
---
 .../src/com/android/server/connectivity/NetworkDiagnostics.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/src/com/android/server/connectivity/NetworkDiagnostics.java b/service/src/com/android/server/connectivity/NetworkDiagnostics.java
index 2e51be39bf..509110d3e2 100644
--- a/service/src/com/android/server/connectivity/NetworkDiagnostics.java
+++ b/service/src/com/android/server/connectivity/NetworkDiagnostics.java
@@ -206,7 +206,7 @@ public class NetworkDiagnostics {
         }
 
         for (RouteInfo route : mLinkProperties.getRoutes()) {
-            if (route.hasGateway()) {
+            if (route.getType() == RouteInfo.RTN_UNICAST && route.hasGateway()) {
                 InetAddress gateway = route.getGateway();
                 prepareIcmpMeasurement(gateway);
                 if (route.isIPv6Default()) {