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

Commit 0147c90f authored by Chalard Jean's avatar Chalard Jean
Browse files

[NS A16] Cleanup 

Move LegacyTypeTracker work into a function for readability.

Test: FrameworksNetTests NetworkStackTests
Change-Id: I9539b8cc4422b3a0cc1d3d9b3a44d59dc1905b44
parent 18ee53f9

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

+31 −20
Original line number Diff line number Diff line
@@ -6522,7 +6522,32 @@ public class ConnectivityService extends IConnectivityManager.Stub 


        final NetworkAgentInfo newDefaultNetwork = getDefaultNetwork();



        // TODO : move the LegacyTypeTracker-related code to a separate function.

        updateLegacyTypeTrackerAndVpnLockdownForRematch(oldDefaultNetwork, newDefaultNetwork, nais);



        // Tear down all unneeded networks.

        for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {

            if (unneeded(nai, UnneededFor.TEARDOWN)) {

                if (nai.getLingerExpiry() > 0) {

                    // This network has active linger timers and no requests, but is not

                    // lingering. Linger it.

                    //

                    // One way (the only way?) this can happen if this network is unvalidated

                    // and became unneeded due to another network improving its score to the

                    // point where this network will no longer be able to satisfy any requests

                    // even if it validates.

                    updateLingerState(nai, now);

                } else {

                    if (DBG) log("Reaping " + nai.name());

                    teardownUnneededNetwork(nai);

                }

            }

        }

    }



    private void updateLegacyTypeTrackerAndVpnLockdownForRematch(

            @Nullable final NetworkAgentInfo oldDefaultNetwork,

            @Nullable final NetworkAgentInfo newDefaultNetwork,

            @NonNull final NetworkAgentInfo[] nais) {

        if (oldDefaultNetwork != newDefaultNetwork) {

            // Maintain the illusion : since the legacy API only understands one network at a time,

            // if the default network changed, apps should see a disconnected broadcast for the
@@ -6537,6 +6562,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                // capability.

                mDefaultInetConditionPublished = newDefaultNetwork.lastValidated ? 100 : 0;

                mLegacyTypeTracker.add(newDefaultNetwork.networkInfo.getType(), newDefaultNetwork);

                // If the legacy VPN is connected, notifyLockdownVpn may end up sending a broadcast

                // to reflect the NetworkInfo of this new network. This broadcast has to be sent

                // after the disconnect broadcasts above, but before the broadcasts sent by the

                // legacy type tracker below.

                // TODO : refactor this, it's too complex

                notifyLockdownVpn(newDefaultNetwork);

            }

        }
@@ -6558,25 +6588,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        for (NetworkAgentInfo nai : nais) {

            addNetworkToLegacyTypeTracker(nai);

        }



        // Tear down all unneeded networks.

        for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {

            if (unneeded(nai, UnneededFor.TEARDOWN)) {

                if (nai.getLingerExpiry() > 0) {

                    // This network has active linger timers and no requests, but is not

                    // lingering. Linger it.

                    //

                    // One way (the only way?) this can happen if this network is unvalidated

                    // and became unneeded due to another network improving its score to the

                    // point where this network will no longer be able to satisfy any requests

                    // even if it validates.

                    updateLingerState(nai, now);

                } else {

                    if (DBG) log("Reaping " + nai.name());

                    teardownUnneededNetwork(nai);

                }

            }

        }

    }



    private void addNetworkToLegacyTypeTracker(@NonNull final NetworkAgentInfo nai) {