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

Commit 04cd68a0 authored by Chalard Jean's avatar Chalard Jean
Browse files

[NS11] Fix yieldToBadWifi over the policy scoring 

This doesn't reactivate the test because it's not yet fixed over int
scoring.

Bug: 184834350
Test: Remove @Ignore and run testAvoidBadWifi
Change-Id: I32477db52eb50faabc499fa68e24ba07577782aa
parent 4d736b92

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

+4 −2
Original line number Diff line number Diff line
@@ -4224,7 +4224,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            // network, we should respect the user's option and don't need to popup the

            // PARTIAL_CONNECTIVITY notification to user again.

            nai.networkAgentConfig.acceptPartialConnectivity = accept;

            nai.updateScoreForNetworkAgentConfigUpdate();

            nai.updateScoreForNetworkAgentUpdate();

            rematchAllNetworksAndRequests();

        }
@@ -4292,6 +4292,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }

        if (!nai.avoidUnvalidated) {

            nai.avoidUnvalidated = true;

            nai.updateScoreForNetworkAgentUpdate();

            rematchAllNetworksAndRequests();

        }

    }
@@ -4399,7 +4400,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 


    private void updateAvoidBadWifi() {

        for (final NetworkAgentInfo nai : mNetworkAgentInfos) {

            nai.updateScoreForNetworkAgentConfigUpdate();

            nai.updateScoreForNetworkAgentUpdate();

        }

        rematchAllNetworksAndRequests();

    }
@@ -7159,6 +7160,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        final NetworkCapabilities prevNc = nai.getAndSetNetworkCapabilities(newNc);



        updateUids(nai, prevNc, newNc);

        nai.updateScoreForNetworkAgentUpdate();



        if (nai.getCurrentScore() == oldScore && newNc.equalRequestableCapabilities(prevNc)) {

            // If the requestable capabilities haven't changed, and the score hasn't changed, then

services/core/java/com/android/server/connectivity/FullScore.java

+26 −7
Original line number Diff line number Diff line
@@ -91,17 +91,26 @@ public class FullScore { 
    /** @hide */

    public static final int POLICY_IS_INVINCIBLE = 58;



    // This network has been validated at least once since it was connected, but not explicitly

    // avoided in UI.

    // TODO : remove setAvoidUnvalidated and instead disconnect the network when the user

    // chooses to move away from this network, and remove this flag.

    /** @hide */

    public static final int POLICY_EVER_VALIDATED_NOT_AVOIDED_WHEN_BAD = 57;



    // To help iterate when printing

    @VisibleForTesting

    static final int MIN_CS_MANAGED_POLICY = POLICY_IS_INVINCIBLE;

    static final int MIN_CS_MANAGED_POLICY = POLICY_EVER_VALIDATED_NOT_AVOIDED_WHEN_BAD;

    @VisibleForTesting

    static final int MAX_CS_MANAGED_POLICY = POLICY_IS_VALIDATED;



    // Mask for policies in NetworkScore. This should have all bits managed by NetworkScore set

    // and all bits managed by FullScore unset. As bits are handled from 0 up in NetworkScore and

    // from 63 down in FullScore, cut at the 32rd bit for simplicity, but change this if some day

    // from 63 down in FullScore, cut at the 32nd bit for simplicity, but change this if some day

    // there are more than 32 bits handled on either side.

    private static final int EXTERNAL_POLICIES_MASK = 0x0000FFFF;

    // YIELD_TO_BAD_WIFI is temporarily handled by ConnectivityService.

    private static final long EXTERNAL_POLICIES_MASK =

            0x00000000FFFFFFFFL & ~(1L << POLICY_YIELD_TO_BAD_WIFI);



    @VisibleForTesting

    static @NonNull String policyNameOf(final int policy) {
@@ -115,6 +124,7 @@ public class FullScore { 
            case POLICY_TRANSPORT_PRIMARY: return "TRANSPORT_PRIMARY";

            case POLICY_EXITING: return "EXITING";

            case POLICY_IS_INVINCIBLE: return "INVINCIBLE";

            case POLICY_EVER_VALIDATED_NOT_AVOIDED_WHEN_BAD: return "EVER_VALIDATED";

        }

        throw new IllegalArgumentException("Unknown policy : " + policy);

    }
@@ -137,6 +147,7 @@ public class FullScore { 
     * @param score the score supplied by the agent

     * @param caps the NetworkCapabilities of the network

     * @param config the NetworkAgentConfig of the network

     * @param everValidated whether this network has ever validated

     * @param yieldToBadWiFi whether this network yields to a previously validated wifi gone bad

     * @return a FullScore that is appropriate to use for ranking.

     */
@@ -145,12 +156,13 @@ public class FullScore { 
    // connectivity for backward compatibility.

    public static FullScore fromNetworkScore(@NonNull final NetworkScore score,

            @NonNull final NetworkCapabilities caps, @NonNull final NetworkAgentConfig config,

            final boolean yieldToBadWiFi) {

            final boolean everValidated, final boolean yieldToBadWiFi) {

        return withPolicies(score.getLegacyInt(), score.getPolicies(),

                score.getKeepConnectedReason(),

                caps.hasCapability(NET_CAPABILITY_VALIDATED),

                caps.hasTransport(TRANSPORT_VPN),

                caps.hasCapability(NET_CAPABILITY_NOT_METERED),

                everValidated,

                config.explicitlySelected,

                config.acceptUnvalidated,

                yieldToBadWiFi,
@@ -179,6 +191,8 @@ public class FullScore { 
        // Prospective scores are always unmetered, because unmetered networks are stronger

        // than metered networks, and it's not known in advance whether the network is metered.

        final boolean unmetered = true;

        // If the offer may validate, then it should be considered to have validated at some point

        final boolean everValidated = mayValidate;

        // The network hasn't been chosen by the user (yet, at least).

        final boolean everUserSelected = false;

        // Don't assume the user will accept unvalidated connectivity.
@@ -189,8 +203,8 @@ public class FullScore { 
        // score.

        final boolean invincible = score.getLegacyInt() > NetworkRanker.LEGACY_INT_MAX;

        return withPolicies(score.getLegacyInt(), score.getPolicies(), KEEP_CONNECTED_NONE,

                mayValidate, vpn, unmetered, everUserSelected, acceptUnvalidated, yieldToBadWiFi,

                invincible);

                mayValidate, vpn, unmetered, everValidated, everUserSelected, acceptUnvalidated,

                yieldToBadWiFi, invincible);

    }



    /**
@@ -204,11 +218,14 @@ public class FullScore { 
    // telephony factory, so that it depends on the carrier. For now this is handled by

    // connectivity for backward compatibility.

    public FullScore mixInScore(@NonNull final NetworkCapabilities caps,

            @NonNull final NetworkAgentConfig config, final boolean yieldToBadWifi) {

            @NonNull final NetworkAgentConfig config,

            final boolean everValidated,

            final boolean yieldToBadWifi) {

        return withPolicies(mLegacyInt, mPolicies, mKeepConnectedReason,

                caps.hasCapability(NET_CAPABILITY_VALIDATED),

                caps.hasTransport(TRANSPORT_VPN),

                caps.hasCapability(NET_CAPABILITY_NOT_METERED),

                everValidated,

                config.explicitlySelected,

                config.acceptUnvalidated,

                yieldToBadWifi,
@@ -224,6 +241,7 @@ public class FullScore { 
            final boolean isValidated,

            final boolean isVpn,

            final boolean isUnmetered,

            final boolean everValidated,

            final boolean everUserSelected,

            final boolean acceptUnvalidated,

            final boolean yieldToBadWiFi,
@@ -232,6 +250,7 @@ public class FullScore { 
                | (isValidated       ? 1L << POLICY_IS_VALIDATED : 0)

                | (isVpn             ? 1L << POLICY_IS_VPN : 0)

                | (isUnmetered       ? 1L << POLICY_IS_UNMETERED : 0)

                | (everValidated     ? 1L << POLICY_EVER_VALIDATED_NOT_AVOIDED_WHEN_BAD : 0)

                | (everUserSelected  ? 1L << POLICY_EVER_USER_SELECTED : 0)

                | (acceptUnvalidated ? 1L << POLICY_ACCEPT_UNVALIDATED : 0)

                | (yieldToBadWiFi    ? 1L << POLICY_YIELD_TO_BAD_WIFI : 0)

services/core/java/com/android/server/connectivity/NetworkAgentInfo.java

+10 −4
Original line number Diff line number Diff line
@@ -707,7 +707,8 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo>, NetworkRa 
            @NonNull final NetworkCapabilities nc) {

        final NetworkCapabilities oldNc = networkCapabilities;

        networkCapabilities = nc;

        mScore = mScore.mixInScore(networkCapabilities, networkAgentConfig, yieldToBadWiFi());

        mScore = mScore.mixInScore(networkCapabilities, networkAgentConfig, everValidatedForYield(),

                yieldToBadWiFi());

        final NetworkMonitorManager nm = mNetworkMonitor;

        if (nm != null) {

            nm.notifyNetworkCapabilitiesChanged(nc);
@@ -919,7 +920,7 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo>, NetworkRa 
     */

    public void setScore(final NetworkScore score) {

        mScore = FullScore.fromNetworkScore(score, networkCapabilities, networkAgentConfig,

                yieldToBadWiFi());

                everValidatedForYield(), yieldToBadWiFi());

    }



    /**
@@ -927,8 +928,13 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo>, NetworkRa 
     *

     * Call this after updating the network agent config.

     */

    public void updateScoreForNetworkAgentConfigUpdate() {

        mScore = mScore.mixInScore(networkCapabilities, networkAgentConfig, yieldToBadWiFi());

    public void updateScoreForNetworkAgentUpdate() {

        mScore = mScore.mixInScore(networkCapabilities, networkAgentConfig,

                everValidatedForYield(), yieldToBadWiFi());

    }



    private boolean everValidatedForYield() {

        return everValidated && !avoidUnvalidated;

    }



    /**

services/core/java/com/android/server/connectivity/NetworkRanker.java

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.net.NetworkScore.POLICY_YIELD_TO_BAD_WIFI; 


import static com.android.server.connectivity.FullScore.POLICY_ACCEPT_UNVALIDATED;

import static com.android.server.connectivity.FullScore.POLICY_EVER_USER_SELECTED;

import static com.android.server.connectivity.FullScore.POLICY_EVER_VALIDATED_NOT_AVOIDED_WHEN_BAD;

import static com.android.server.connectivity.FullScore.POLICY_IS_INVINCIBLE;

import static com.android.server.connectivity.FullScore.POLICY_IS_VALIDATED;

import static com.android.server.connectivity.FullScore.POLICY_IS_VPN;
@@ -161,7 +162,7 @@ public class NetworkRanker { 
        // Yield to bad wifi policy : if any wifi has ever been validated, keep only networks

        // that don't yield to such a wifi network.

        final boolean anyWiFiEverValidated = CollectionUtils.any(candidates,

                nai -> nai.getScore().hasPolicy(POLICY_EVER_USER_SELECTED)

                nai -> nai.getScore().hasPolicy(POLICY_EVER_VALIDATED_NOT_AVOIDED_WHEN_BAD)

                        && nai.getCaps().hasTransport(TRANSPORT_WIFI));

        if (anyWiFiEverValidated) {

            partitionInto(candidates, nai -> !nai.getScore().hasPolicy(POLICY_YIELD_TO_BAD_WIFI),

tests/net/java/com/android/server/connectivity/FullScoreTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ class FullScoreTest { 
            if (vpn) addTransportType(NetworkCapabilities.TRANSPORT_VPN)

            if (validated) addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)

        }.build()

        return mixInScore(nc, nac, false /* avoidBadWifi */)

        return mixInScore(nc, nac, validated, false /* yieldToBadWifi */)

    }



    @Test