| commit | bca0e41f18354e30b2ae96fc73b1e9316a85305a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 16 06:31:42 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 16 06:31:42 2023 +0000 |
| tree | 5b6df4565ecec2d15c1bfff725f2fe27051ef3e3 | |
| parent | 148535bfbe14970d28679e12f22b0698b81685a9 [diff] | |
| parent | 60ec7781ed9d187407ce63a8202caf3c50b4b034 [diff] |
Merge "Remove spurious WTF on pre-U devices." into udc-dev am: 60ec7781ed Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/23687832 Change-Id: I86f2b0e8f008649c6a57497ecd8fe99a62effc38 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 a4b4ef8..5e14be5 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java
@@ -4559,7 +4559,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();