diff options
| author | Chalard Jean <jchalard@google.com> | 2021-03-19 06:16:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-19 06:16:37 +0000 |
| commit | f88102ce0eba2e3e7ee9a916a425825fc818f712 (patch) | |
| tree | f28e2906690ace7fa0f1877f3a71a8f9093cd82b | |
| parent | b079fe666f2f8a222acad3952856a0fda6983247 (diff) | |
| parent | 0528521bea3c3d70f706682e9dc0b017e053deba (diff) | |
Merge "Use the NetworkScore API in VPN"
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Vpn.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 124c3741ad57..12a53151c30c 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -68,6 +68,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; @@ -1258,7 +1259,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. |