Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c8cd0d9 authored by Chalard Jean's avatar Chalard Jean Committed by Automerger Merge Worker
Browse files

Merge "Use the NetworkScore API in VPN" am: f88102ce am: 4b7c64df am: 7c204b87 am: 4d3217ba 

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

Change-Id: I802462c67f09c30db6dc978406f3c3999b42d0b6
parents 3b757a29 4d3217ba

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -69,6 +69,7 @@ import android.net.NetworkInfo; 
import android.net.NetworkInfo.DetailedState;

import android.net.NetworkInfo.DetailedState;

import android.net.NetworkProvider;

import android.net.NetworkProvider;

import android.net.NetworkRequest;

import android.net.NetworkRequest;

import android.net.NetworkScore;

import android.net.RouteInfo;

import android.net.RouteInfo;

import android.net.UidRange;

import android.net.UidRange;

import android.net.UidRangeParcel;

import android.net.UidRangeParcel;
@@ -1260,7 +1261,9 @@ public class Vpn { 
        }

        }





        mNetworkAgent = new NetworkAgent(mContext, mLooper, NETWORKTYPE /* logtag */,

        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

            @Override

            public void unwanted() {

            public void unwanted() {

                // We are user controlled, not driven by NetworkRequest.

                // We are user controlled, not driven by NetworkRequest.