commit fa7bfbd050c4da898e505a5fe63421a2449ea6de
author Taras Antoshchuk <tantoshchuk@google.com> Thu Mar 17 12:04:28 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 17 12:04:28 2022 +0000
tree 7462e563e7c9ca7e0212d6c7e5fddfd6e3d2f507
parent 7c5490cc2e841181e71d62d4a8f54b9e0cf0a0c0
parent 37a3fd117beb6a508c614542b85140d72f45fcf2

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

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

Change-Id: I290ac6201f00356249bada0b6ec91aa6ad4d8669

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