LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NS A32] More simplification

Browse Source 
Test: FrameworksNetTests
Change-Id: Ib713c4ae0100c8c242bbba87b2881311c5761869
This commit is contained in:
Chalard Jean
2019-12-03 20:37:01 +09:00
parent 967190ecd0
commit 00419abe9e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -6198,7 +6198,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} }
private void sendUpdatedScoreToFactories(NetworkRequest networkRequest, NetworkAgentInfo nai) { private void sendUpdatedScoreToFactories(@NonNull NetworkRequest networkRequest,
@Nullable NetworkAgentInfo nai) {
int score = 0; int score = 0;
int serial = 0; int serial = 0;
if (nai != null) { if (nai != null) {
@@ -6567,12 +6568,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (!newSatisfier.addRequest(nri.request)) { if (!newSatisfier.addRequest(nri.request)) {
Slog.wtf(TAG, "BUG: " + newSatisfier.name() + " already has " + nri.request); Slog.wtf(TAG, "BUG: " + newSatisfier.name() + " already has " + nri.request);
} }
// Tell NetworkProviders about the new score, so they can stop
// trying to connect if they know they cannot match it.
// TODO - this could get expensive if we have a lot of requests for this
// network. Think about if there is a way to reduce this. Push
// netid->request mapping to each provider?
sendUpdatedScoreToFactories(nri.request, newSatisfier);
} else { } else {
// If "newNetwork" is listed as satisfying "nri" but no longer satisfies "nri", // If "newNetwork" is listed as satisfying "nri" but no longer satisfies "nri",
// mark it as no longer satisfying "nri". Because networks are processed by // mark it as no longer satisfying "nri". Because networks are processed by
@@ -6588,8 +6583,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
newNetwork.removeRequest(nri.request.requestId); newNetwork.removeRequest(nri.request.requestId);
nri.mSatisfier = null; nri.mSatisfier = null;
if (isDefaultRequest(nri)) mDefaultNetworkNai = null; if (isDefaultRequest(nri)) mDefaultNetworkNai = null;
sendUpdatedScoreToFactories(nri.request, null);
} }
// Tell NetworkProviders about the new score, so they can stop
// trying to connect if they know they cannot match it.
// TODO - this could get expensive if there are a lot of outstanding requests for this
// network. Think of a way to reduce this. Push netid->request mapping to each factory?
sendUpdatedScoreToFactories(nri.request, newSatisfier);
} }
} }