LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove spurious WTF on pre-U devices.

Browse Source 
aosp/2162425 added a WTF if a NetworkAgent changed state before
its native network has been created. This was intended to apply
only to the new U+ codepath, where networks are always created
immediately as soon as their agents register them. But the WTF is
logged on pre-U devices as well.

Fix this so that the WTF is only logged when the new codepath is
running.

Fix: 285999421
Test: TH
Change-Id: I28bda08a006978ab760fe8891bf5cf15b536201a
This commit is contained in:
Lorenzo Colitti
2023-06-07 11:34:05 +09:00
parent f1a61ad83d
commit 233f2d1d19
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service/src/com/android/server/ConnectivityService.java
View File

@@ -4480,7 +4480,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (state == NetworkInfo.State.CONNECTED) return true; if (state == NetworkInfo.State.CONNECTED) return true;
if (state != NetworkInfo.State.CONNECTING) { if (state != NetworkInfo.State.CONNECTING) {
// TODO: throw if no WTFs are observed in the field. // 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 false;
} }
return nai.isVPN() || shouldCreateNetworksImmediately(); return nai.isVPN() || shouldCreateNetworksImmediately();