From a517f20ef0cdbca0a317baa5e372cf45b77087bc Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Tue, 15 Feb 2022 11:58:41 +0100 Subject: [PATCH] reduce log level when no interface is present for rate limiting TestNetworkAgentWrapper does not set the interface name in its LinkProperties causing logwtf to fail tests on -eng build. Test: atest FrameworksNetTests:ConnectivityServiceTest on -eng build Change-Id: Ieba0453ce897aa1052cb98f1de4c7bb099383c8d --- service/src/com/android/server/ConnectivityService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 6024a2a45f..271dd174a7 100644 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -10691,8 +10691,9 @@ public class ConnectivityService extends IConnectivityManager.Stub final String iface = networkAgent.linkProperties.getInterfaceName(); if (iface == null) { - // This can never happen. - logwtf("canNetworkBeRateLimited: LinkProperties#getInterfaceName returns null"); + // This may happen in tests, but if there is no interface then there is nothing that + // can be rate limited. + loge("canNetworkBeRateLimited: LinkProperties#getInterfaceName returns null"); return false; } return true;