commit 83a667988500b04ae6233505ab8e92757fb69770
author Taras Antoshchuk <tantoshchuk@google.com> Thu Mar 17 12:05:55 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 17 12:05:55 2022 +0000
tree d49a169d87bbad46e668ea7bcf5ef4abc9bfc0a6
parent 0b415c8aea1a87bc54f7ff9e576ad077f30faba5
parent fb87e1a545b05587e0f9ec37b4a6db6816ff4dec

Merge "Explicitly check route type in NetworkDiagnostics" am: 1c2f79705f am: fb87e1a545

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784544

Change-Id: Ifa2492061b8af20b38e7d11a002c22d5b14b1d10

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