commit 698a57c268b71f229231655e24b0478fdd351dce
author Taras Antoshchuk <tantoshchuk@google.com> Mon Aug 02 18:19:55 2021 +0200
committer Muhammad Hasan Khan <mhasank@google.com> Mon Feb 28 21:30:15 2022 +0000
tree f9093064080c4f89901dc907bc44955c6e8d4b51
parent 61ef984d52ac45c3381fe32dc391537816c1f32c

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

service/src/com/android/server/connectivity/NetworkDiagnostics.java

diff --git a/service/src/com/android/server/connectivity/NetworkDiagnostics.java b/service/src/com/android/server/connectivity/NetworkDiagnostics.java
index 2e51be3..509110d 100644
--- a/service/src/com/android/server/connectivity/NetworkDiagnostics.java
+++ b/service/src/com/android/server/connectivity/NetworkDiagnostics.java
@@ -206,7 +206,7 @@
         }
 
         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()) {