summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author junyulai <junyulai@google.com> 2021-03-19 15:12:37 +0800
committer junyulai <junyulai@google.com> 2021-03-19 15:48:25 +0800
commit705370a2315e2375a48a377cfe1e908d51ca913a (patch)
treeae9ebd44e0b3b9fd3dd17eebb2e06a40f00d085a
parenta1a61cde9c1d44bb1045573dc6350eac8ac32b5f (diff)
Remove reference of NetworkAgent#unwanted()
This is hidden, use onNetworkUnwanted instead. Test: TH Bug: 182963397 Merged-In: I4e80a75d25cfd9ffc07aa219fff5a2604eb307f2 Change-Id: I4e80a75d25cfd9ffc07aa219fff5a2604eb307f2 (cherry-picked from ag/13925163)
-rw-r--r--services/core/java/com/android/server/connectivity/Vpn.java2
-rw-r--r--services/core/java/com/android/server/vcn/VcnGatewayConnection.java2
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 ab32c429cbbc..05ce04dbcd48 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -1260,7 +1260,7 @@ public class Vpn {
mNetworkAgent = new NetworkAgent(mContext, mLooper, NETWORKTYPE /* logtag */,
mNetworkCapabilities, lp, VPN_DEFAULT_SCORE, networkAgentConfig, mNetworkProvider) {
@Override
- public void unwanted() {
+ public void onNetworkUnwanted() {
// We are user controlled, not driven by NetworkRequest.
}
};
diff --git a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java
index 84bc6a805626..673618b607aa 100644
--- a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java
+++ b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java
@@ -1444,7 +1444,7 @@ public class VcnGatewayConnection extends StateMachine {
new NetworkAgentConfig.Builder().build(),
mVcnContext.getVcnNetworkProvider()) {
@Override
- public void unwanted() {
+ public void onNetworkUnwanted() {
Slog.d(TAG, "NetworkAgent was unwanted");
teardownAsynchronously();
}