| commit | a1d077267e21e2b5152872f5a0ba77653dcb6094 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Wed Jun 07 10:12:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 07 10:12:37 2023 +0000 |
| tree | 4f304133b45ca429e366cf6cef6fa3f6bd544265 | |
| parent | 44241c80d72421f56612ae6e592e785bac76dbeb [diff] | |
| parent | 80e186e43d797dd421523202eaa6d9e1493e1fe9 [diff] |
Merge "Remove spurious WTF on pre-U devices." am: c2851d45fd am: 80e186e43d Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618590 Change-Id: I6f44edb835833a52ab962433d83ea9397c76cf77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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();