Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ia91b3b3c,Id9ecdac5,I4b17d1b1

Browse Source 
* changes:
  Revert "[NS D01] Remove candidates that don't satisfy the request."
  Revert "[NS D02] Mix in the ignore on wifi policy."
  Revert "Address comments on ag/10316753"
This commit is contained in:
Chalard Jean
2020-02-21 11:06:55 +00:00
committed by Android (Google) Code Review
parent 358a2d2c99 96726bcbb9
commit 94fa6dc345
4 changed files with 27 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/net/NetworkScore.java
View File

@@ -21,6 +21,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
@@ -86,7 +87,7 @@ public final class NetworkScore implements Parcelable {
/** toString */
public String toString() {
return "latency = " + latencyMs + " downlinkBandwidth = " + downlinkBandwidthKBps
+ " uplinkBandwidth = " + uplinkBandwidthKBps;
+ "uplinkBandwidth = " + uplinkBandwidthKBps;
}
@NonNull
@@ -353,27 +354,17 @@ public final class NetworkScore implements Parcelable {
private Metrics mLinkLayerMetrics = new Metrics(Metrics.LATENCY_UNKNOWN,
Metrics.BANDWIDTH_UNKNOWN, Metrics.BANDWIDTH_UNKNOWN);
@NonNull
private Metrics mEndToEndMetrics = new Metrics(Metrics.LATENCY_UNKNOWN,
private Metrics mEndToMetrics = new Metrics(Metrics.LATENCY_UNKNOWN,
Metrics.BANDWIDTH_UNKNOWN, Metrics.BANDWIDTH_UNKNOWN);
private int mSignalStrength = UNKNOWN_SIGNAL_STRENGTH;
private int mRange = RANGE_UNKNOWN;
private boolean mExiting = false;
private int mLegacyScore = 0;
@NonNull private Bundle mExtensions = new Bundle();
/** Create a new builder. */
public Builder() { }
/** @hide */
public Builder(@NonNull final NetworkScore source) {
mPolicy = source.mPolicy;
mLinkLayerMetrics = source.mLinkLayerMetrics;
mEndToEndMetrics = source.mEndToEndMetrics;
mSignalStrength = source.mSignalStrength;
mRange = source.mRange;
mExiting = source.mExiting;
mLegacyScore = source.mLegacyScore;
}
/** Add a policy flag. */
@NonNull public Builder addPolicy(@Policy final int policy) {
mPolicy |= policy;
@@ -394,7 +385,7 @@ public final class NetworkScore implements Parcelable {
/** Set the end-to-end metrics. */
@NonNull public Builder setEndToEndMetrics(@NonNull final Metrics endToEndMetrics) {
mEndToEndMetrics = endToEndMetrics;
mEndToMetrics = endToEndMetrics;
return this;
}
@@ -426,7 +417,7 @@ public final class NetworkScore implements Parcelable {
/** Build the NetworkScore object represented by this builder. */
@NonNull public NetworkScore build() {
return new NetworkScore(mPolicy, mLinkLayerMetrics, mEndToEndMetrics,
return new NetworkScore(mPolicy, mLinkLayerMetrics, mEndToMetrics,
mSignalStrength, mRange, mExiting, mLegacyScore);
}
}

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

@@ -3839,9 +3839,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
return avoidBadWifi();
}
private void rematchForAvoidBadWifiUpdate() {
ensureRunningOnConnectivityServiceThread();
mixInAllNetworkScores();
rematchAllNetworksAndRequests();
for (NetworkAgentInfo nai: mNetworkAgentInfos.values()) {
if (nai.networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
@@ -7067,45 +7066,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
}
/**
* Re-mixin all network scores.
* This is called when some global setting like avoidBadWifi has changed.
* TODO : remove this when all usages have been removed.
*/
private void mixInAllNetworkScores() {
ensureRunningOnConnectivityServiceThread();
for (final NetworkAgentInfo nai : mNetworkAgentInfos.values()) {
nai.setNetworkScore(mixInNetworkScore(nai, nai.getNetworkScore()));
}
}
/**
* Mix in the Connectivity-managed parts of the NetworkScore.
* @param nai The NAI this score applies to.
* @param sourceScore the score sent by the network agent, or the previous score of this NAI.
* @return A new score with the Connectivity-managed parts mixed in.
*/
@NonNull
private NetworkScore mixInNetworkScore(@NonNull final NetworkAgentInfo nai,
@NonNull final NetworkScore sourceScore) {
final NetworkScore.Builder score = new NetworkScore.Builder(sourceScore);
// TODO : this should be done in Telephony. It should be handled per-network because
// it's a carrier-dependent config.
if (nai.networkCapabilities.hasTransport(TRANSPORT_CELLULAR)) {
if (mMultinetworkPolicyTracker.getAvoidBadWifi()) {
score.clearPolicy(NetworkScore.POLICY_IGNORE_ON_WIFI);
} else {
score.addPolicy(NetworkScore.POLICY_IGNORE_ON_WIFI);
}
}
return score.build();
}
private void updateNetworkScore(NetworkAgentInfo nai, NetworkScore ns) {
if (VDBG || DDBG) log("updateNetworkScore for " + nai.toShortString() + " to " + ns);
nai.setNetworkScore(mixInNetworkScore(nai, ns));
nai.setNetworkScore(ns);
rematchAllNetworksAndRequests();
sendUpdatedScoreToFactories(nai);
}

9
services/core/java/com/android/server/connectivity/NetworkRanker.java
View File

@@ -20,7 +20,6 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.net.NetworkRequest;
import java.util.ArrayList;
import java.util.Collection;
/**
@@ -32,15 +31,15 @@ public class NetworkRanker {
/**
* Find the best network satisfying this request among the list of passed networks.
*/
// Almost equivalent to Collections.max(nais), but allows returning null if no network
// satisfies the request.
@Nullable
public NetworkAgentInfo getBestNetwork(@NonNull final NetworkRequest request,
@NonNull final Collection<NetworkAgentInfo> nais) {
final ArrayList<NetworkAgentInfo> candidates = new ArrayList<>(nais);
candidates.removeIf(nai -> !nai.satisfies(request));
NetworkAgentInfo bestNetwork = null;
int bestScore = Integer.MIN_VALUE;
for (final NetworkAgentInfo nai : candidates) {
for (final NetworkAgentInfo nai : nais) {
if (!nai.satisfies(request)) continue;
if (nai.getCurrentScore() > bestScore) {
bestNetwork = nai;
bestScore = nai.getCurrentScore();

42
tests/net/common/java/android/net/NetworkScoreTest.kt
View File

@@ -16,9 +16,7 @@
package android.net
import android.net.NetworkScore.POLICY_DEFAULT_SUBSCRIPTION
import android.net.NetworkScore.POLICY_IGNORE_ON_WIFI
import android.net.NetworkScore.RANGE_MEDIUM
import android.net.NetworkScore.Metrics.BANDWIDTH_UNKNOWN
import androidx.test.filters.SmallTest
import androidx.test.runner.AndroidJUnit4
import com.android.testutils.assertParcelSane
@@ -34,30 +32,26 @@ private const val TEST_SCORE = 80
@RunWith(AndroidJUnit4::class)
@SmallTest
class NetworkScoreTest {
private fun makeScoreBuilder() = NetworkScore.Builder()
.setLegacyScore(TEST_SCORE)
.addPolicy(POLICY_IGNORE_ON_WIFI)
.addPolicy(POLICY_DEFAULT_SUBSCRIPTION)
.setExiting(false)
.setEndToEndMetrics(NetworkScore.Metrics(145 /* latency */,
2500 /* downlinkBandwidth */, 1430 /* uplinkBandwidth */))
.setRange(RANGE_MEDIUM)
.setSignalStrength(400)
@Test
fun testParcelNetworkScore() {
val defaultCap = NetworkCapabilities()
val legacyBuilder = NetworkScore.Builder().setLegacyScore(TEST_SCORE)
assertEquals(TEST_SCORE, legacyBuilder.build().getLegacyScore())
assertParcelSane(legacyBuilder.build(), 7)
val builder = makeScoreBuilder()
val builder = NetworkScore.Builder().setLegacyScore(TEST_SCORE)
assertEquals(TEST_SCORE, builder.build().getLegacyScore())
assertParcelSane(builder.build(), 7)
builder.clearPolicy(POLICY_IGNORE_ON_WIFI)
builder.addPolicy(NetworkScore.POLICY_IGNORE_ON_WIFI)
.addPolicy(NetworkScore.POLICY_DEFAULT_SUBSCRIPTION)
.setLinkLayerMetrics(NetworkScore.Metrics(44 /* latency */,
380 /* downlinkBandwidth */, BANDWIDTH_UNKNOWN /* uplinkBandwidth */))
.setEndToEndMetrics(NetworkScore.Metrics(11 /* latency */,
BANDWIDTH_UNKNOWN /* downlinkBandwidth */, 100_000 /* uplinkBandwidth */))
.setRange(NetworkScore.RANGE_MEDIUM)
assertParcelSane(builder.build(), 7)
builder.clearPolicy(NetworkScore.POLICY_IGNORE_ON_WIFI)
val ns = builder.build()
assertParcelSane(ns, 7)
assertFalse(ns.hasPolicy(POLICY_IGNORE_ON_WIFI))
assertTrue(ns.hasPolicy(POLICY_DEFAULT_SUBSCRIPTION))
assertFalse(ns.hasPolicy(NetworkScore.POLICY_IGNORE_ON_WIFI))
assertTrue(ns.hasPolicy(NetworkScore.POLICY_DEFAULT_SUBSCRIPTION))
val exitingNs = ns.withExiting(true)
assertNotEquals(ns.isExiting, exitingNs.isExiting)
@@ -79,10 +73,4 @@ class NetworkScoreTest {
assertTrue(builder1.build().equals(builder2.build()))
assertEquals(builder1.build().hashCode(), builder2.build().hashCode())
}
@Test
fun testBuilderEquals() {
val ns = makeScoreBuilder().build()
assertEquals(ns, NetworkScore.Builder(ns).build())
}
}