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

Merge "Remove spurious WTF in rematching networks." am: 4e6c1d8643

Browse Source 
am: 421fcc6ec2

Change-Id: Ia1f7426a2f75ed6e6264a932255f77e707968165
This commit is contained in:
Lorenzo Colitti
2018-10-01 02:23:37 -07:00
committed by android-build-merger
parent 3b2cdecbca 421fcc6ec2
commit b6113e8621
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -2808,20 +2808,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} }
// TODO: remove this code once we know that the Slog.wtf is never hit.
//
// Find all networks that are satisfying this request and remove the request
// from their request lists.
// TODO - it's my understanding that for a request there is only a single
// network satisfying it, so this loop is wasteful
for (NetworkAgentInfo otherNai : mNetworkAgentInfos.values()) {
if (otherNai.isSatisfyingRequest(nri.request.requestId) && otherNai != nai) {
Slog.wtf(TAG, "Request " + nri.request + " satisfied by " +
otherNai.name() + ", but mNetworkAgentInfos says " +
(nai != null ? nai.name() : "null"));
}
}
// Maintain the illusion. When this request arrived, we might have pretended // Maintain the illusion. When this request arrived, we might have pretended
// that a network connected to serve it, even though the network was already // that a network connected to serve it, even though the network was already
// connected. Now that this request has gone away, we might have to pretend // connected. Now that this request has gone away, we might have to pretend