Merge "Remove spurious WTF on pre-U devices." am: c2851d45fd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618590 Change-Id: I7506ddcca76c312fbd9129b5d36b518897b63a03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
80e186e43d
1 changed files with 3 additions and 1 deletions
|
|
@ -4557,7 +4557,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();
|
||||
|
|
|
|||
Loading…
Reference in a new issue