commit c2851d45fdc9004d0a1f795389d4f8964515c282
author Lorenzo Colitti <lorenzo@google.com> Wed Jun 07 09:00:13 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 07 09:00:13 2023 +0000
tree 61d377d94e88d5ad68ae870e7c98580247a4e1dd
parent 1edaaf291a07319bc956a17cdc1af7504fd2edc8
parent 233f2d1d19bd36701e0dcfed6a57c85fac678e12

Merge "Remove spurious WTF on pre-U devices."

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index d9b70b6..d4d9233 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -4557,7 +4557,9 @@
         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();