| commit | f071a921c17cdba01bd2be1090f9d0eb6fbc5e75 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Wed Jun 07 10:57:40 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 07 10:57:40 2023 +0000 |
| tree | 3fce2b35253fc8e14eef3b48f7db99b47f4d4d84 | |
| parent | 7b170eb0b8530d65e8cde2f80f7ae8dd5131433e [diff] | |
| parent | a1d077267e21e2b5152872f5a0ba77653dcb6094 [diff] |
Merge "Remove spurious WTF on pre-U devices." am: c2851d45fd am: 80e186e43d am: a1d077267e Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618590 Change-Id: I74ff8480827d125ec27d8578c135843a93c2fbb0 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 f85f336..28d1d73 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java
@@ -4560,7 +4560,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();