Merge "Add public fields to NetworkScore and make it @SystemApi"

2020-01-31 03:06:16 +00:00
parent 8d0ca5efde 511f7e3792
commit 9eece865c0
8 changed files with 446 additions and 119 deletions
--- a/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java
+++ b/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java
@@ -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);