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

Commit 1e9fb511 authored by Chalard Jean's avatar Chalard Jean
Browse files

[NS A27] Remove useless logs and a useless var 

These logs haven't found a bug in a long time and we now have
some structural guarantees that the conditions they check for
can't happen (like the checks that everything is happening on
the same thread).
Maybe we'll reinstate similar checks later, but for now they
are in the way and removing them is a small sacrifice for the
intended benefit.

The local was simply not used any more.

Test: FrameworksNetTests
Change-Id: If8c8d1f3eb883ffcf0fbdb70824b87dd70da507c
parent f96e7871

services/core/java/com/android/server/ConnectivityService.java

+0 −18
Original line number Diff line number Diff line
@@ -6426,19 +6426,13 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        changes.addRematchedNetwork(new NetworkReassignment.NetworkBgStatePair(newNetwork,

                newNetwork.isBackgroundNetwork()));



        final int score = newNetwork.getCurrentScore();



        if (VDBG || DDBG) log("rematching " + newNetwork.name());



        final ArrayMap<NetworkRequestInfo, NetworkAgentInfo> reassignedRequests =

                computeRequestReassignmentForNetwork(newNetwork);



        NetworkCapabilities nc = newNetwork.networkCapabilities;

        if (VDBG) log(" network has: " + nc);



        // Find and migrate to this Network any NetworkRequests for

        // which this network is now the best.

        final ArrayList<NetworkAgentInfo> removedRequests = new ArrayList<>();

        for (final Map.Entry<NetworkRequestInfo, NetworkAgentInfo> entry :

                reassignedRequests.entrySet()) {

            final NetworkRequestInfo nri = entry.getKey();
@@ -6452,7 +6446,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                    }

                    previousSatisfier.removeRequest(nri.request.requestId);

                    previousSatisfier.lingerRequest(nri.request, now, mLingerDelayMs);

                    removedRequests.add(previousSatisfier);

                } else {

                    if (VDBG || DDBG) log("   accepting network in place of null");

                }
@@ -6519,17 +6512,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            // Have a new default network, release the transition wakelock in

            scheduleReleaseNetworkTransitionWakelock();

        }



        if (!newNetwork.networkCapabilities.equalRequestableCapabilities(nc)) {

            Slog.wtf(TAG, String.format(

                    "BUG: %s changed requestable capabilities during rematch: %s -> %s",

                    newNetwork.name(), nc, newNetwork.networkCapabilities));

        }

        if (newNetwork.getCurrentScore() != score) {

            Slog.wtf(TAG, String.format(

                    "BUG: %s changed score during rematch: %d -> %d",

                    newNetwork.name(), score, newNetwork.getCurrentScore()));

        }

    }



    /**