From 233f2d1d19bd36701e0dcfed6a57c85fac678e12 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Wed, 7 Jun 2023 11:34:05 +0900 Subject: [PATCH] Remove spurious WTF on pre-U devices. aosp/2162425 added a WTF if a NetworkAgent changed state before its native network has been created. This was intended to apply only to the new U+ codepath, where networks are always created immediately as soon as their agents register them. But the WTF is logged on pre-U devices as well. Fix this so that the WTF is only logged when the new codepath is running. Fix: 285999421 Test: TH Change-Id: I28bda08a006978ab760fe8891bf5cf15b536201a --- service/src/com/android/server/ConnectivityService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index b5c9b0a256..ecf83acbeb 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -4480,7 +4480,9 @@ public class ConnectivityService extends IConnectivityManager.Stub if (state == NetworkInfo.State.CONNECTED) return true; if (state != NetworkInfo.State.CONNECTING) { // TODO: throw if no WTFs are observed in the field. - Log.wtf(TAG, "Uncreated network in invalid state: " + state); + if (shouldCreateNetworksImmediately()) { + Log.wtf(TAG, "Uncreated network in invalid state: " + state); + } return false; } return nai.isVPN() || shouldCreateNetworksImmediately();