Merge "Use the NetworkScore API in VPN" am: f88102ce0e am: 4b7c64df40 am: 7c204b87f1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645286

Change-Id: I44f1357c44b195ba6a9394b919a215e32677e9c5

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

@@ -69,6 +69,7 @@ import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
 import android.net.NetworkProvider;
 import android.net.NetworkRequest;
+import android.net.NetworkScore;
 import android.net.RouteInfo;
 import android.net.UidRange;
 import android.net.UidRangeParcel;
@@ -1260,7 +1261,9 @@ public class Vpn {
         }
 
         mNetworkAgent = new NetworkAgent(mContext, mLooper, NETWORKTYPE /* logtag */,
-                mNetworkCapabilities, lp, VPN_DEFAULT_SCORE, networkAgentConfig, mNetworkProvider) {
+                mNetworkCapabilities, lp,
+                new NetworkScore.Builder().setLegacyInt(VPN_DEFAULT_SCORE).build(),
+                networkAgentConfig, mNetworkProvider) {
             @Override
             public void unwanted() {
                 // We are user controlled, not driven by NetworkRequest.