Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3338f72 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Merge "Remove spurious WTF in rematching networks." am: fba50df5 am:...

Merge "Merge "Remove spurious WTF in rematching networks." am: fba50df5 am: 1f7f7914" into pi-dev-plus-aosp
am: 8f653906

Change-Id: I9a2ba5d9104756cc34b01f5327e5bb72705691ac
parents 53dda9db 8f653906
Loading
Loading
Loading
Loading
+0 −14
Original line number Diff line number Diff line
@@ -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
            // 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