From a1a61cde9c1d44bb1045573dc6350eac8ac32b5f Mon Sep 17 00:00:00 2001 From: junyulai Date: Fri, 19 Mar 2021 14:58:46 +0800 Subject: [PATCH] Remove references of NetworkAgentConfig constructor This is hidden, use public Builder instead. Test: TH Bug: 182963397 Merged-In: Ib8ea2a17276cfd000e7003fc86d15458e1f82b39 Change-Id: Ib8ea2a17276cfd000e7003fc86d15458e1f82b39 (cherry-picked from ag/13925162) --- services/core/java/com/android/server/connectivity/Vpn.java | 2 +- .../core/java/com/android/server/vcn/VcnGatewayConnection.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 124c3741ad57b..ab32c429cbbcc 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -1239,7 +1239,7 @@ public class Vpn { mLegacyState = LegacyVpnInfo.STATE_CONNECTING; updateState(DetailedState.CONNECTING, "agentConnect"); - NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig(); + NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig.Builder().build(); networkAgentConfig.allowBypass = mConfig.allowBypass && !mLockdown; mNetworkCapabilities.setOwnerUid(mOwnerUID); diff --git a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java index 516426558d5b6..84bc6a8056268 100644 --- a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java +++ b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java @@ -1441,7 +1441,7 @@ public class VcnGatewayConnection extends StateMachine { caps, lp, Vcn.getNetworkScore(), - new NetworkAgentConfig(), + new NetworkAgentConfig.Builder().build(), mVcnContext.getVcnNetworkProvider()) { @Override public void unwanted() {