commit 1c2f79705fc54d914aafbb318fa4e7fd7fb327fb
author Taras Antoshchuk <tantoshchuk@google.com> Thu Mar 17 11:08:50 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 17 11:08:50 2022 +0000
tree d49a169d87bbad46e668ea7bcf5ef4abc9bfc0a6
parent 1b13af010a2a4889696f5470240a8ec36eeb6687
parent 698a57c268b71f229231655e24b0478fdd351dce

Merge "Explicitly check route type in NetworkDiagnostics"

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()) {