Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove reference of NetworkAgent#unwanted()

Browse Source 
This is hidden, use onNetworkUnwanted instead.

Test: TH
Bug: 182963397
Merged-In: I4e80a75d25cfd9ffc07aa219fff5a2604eb307f2
Change-Id: I4e80a75d25cfd9ffc07aa219fff5a2604eb307f2
  (cherry-picked from ag/13925163)
This commit is contained in:
junyulai
2021-03-19 15:12:37 +08:00
parent a1a61cde9c
commit 705370a231
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -1260,7 +1260,7 @@ 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, VPN_DEFAULT_SCORE, networkAgentConfig, mNetworkProvider) {
@Override @Override
public void unwanted() { public void onNetworkUnwanted() {
// We are user controlled, not driven by NetworkRequest. // We are user controlled, not driven by NetworkRequest.
} }
}; };

2
services/core/java/com/android/server/vcn/VcnGatewayConnection.java
View File

@@ -1444,7 +1444,7 @@ public class VcnGatewayConnection extends StateMachine {
new NetworkAgentConfig.Builder().build(), new NetworkAgentConfig.Builder().build(),
mVcnContext.getVcnNetworkProvider()) { mVcnContext.getVcnNetworkProvider()) {
@Override @Override
public void unwanted() { public void onNetworkUnwanted() {
Slog.d(TAG, "NetworkAgent was unwanted"); Slog.d(TAG, "NetworkAgent was unwanted");
teardownAsynchronously(); teardownAsynchronously();
} }