LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add public fields to NetworkScore and make it @SystemApi

Browse Source 
Bug: 113554781
Bug: 146583853
Test: FrameworksNetTests
Change-Id: I19d965c0146196cb67b3417eb1790ccd90ce3233
This commit is contained in:
Chalard Jean
2020-01-14 17:03:42 +09:00
parent a09393703b
commit a9727279ae
8 changed files with 446 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/net/integration/util/com/android/server/NetworkAgentWrapper.java
View File

@@ -40,6 +40,7 @@ import android.net.NetworkAgentConfig;
import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.NetworkProvider;
import android.net.NetworkScore;
import android.net.NetworkSpecifier;
import android.net.SocketKeepalive;
import android.net.UidRange;
@@ -155,9 +156,13 @@ public class NetworkAgentWrapper implements TestableNetworkCallback.HasNetwork {
}
}
private NetworkScore makeNetworkScore(final int legacyScore) {
return new NetworkScore.Builder().setLegacyScore(legacyScore).build();
}
public void adjustScore(int change) {
mScore += change;
mNetworkAgent.sendNetworkScore(mScore);
mNetworkAgent.sendNetworkScore(makeNetworkScore(mScore));
}
public int getScore() {

3
tests/net/java/com/android/server/connectivity/LingerMonitorTest.java
View File

@@ -353,8 +353,7 @@ public class LingerMonitorTest {
NetworkCapabilities caps = new NetworkCapabilities();
caps.addCapability(0);
caps.addTransportType(transport);
NetworkScore ns = new NetworkScore();
ns.putIntExtension(NetworkScore.LEGACY_SCORE, 50);
NetworkScore ns = new NetworkScore.Builder().setLegacyScore(50).build();
NetworkAgentInfo nai = new NetworkAgentInfo(null, null, new Network(netId), info, null,
caps, ns, mCtx, null, null /* config */, mConnService, mNetd, mDnsResolver, mNMS,
NetworkProvider.ID_NONE);