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

Merge "Notify NetworkStats only when interfaces changed in updateLinkProperties"

Browse Source
This commit is contained in:
Junyu Lai
2022-10-27 06:49:33 +00:00
committed by Gerrit Code Review
parent c39c3759ca 2ed7d4182a
commit 0f4cb380f0
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
service/src/com/android/server/ConnectivityService.java
View File

@@ -7500,7 +7500,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
private void updateLinkProperties(NetworkAgentInfo networkAgent, @NonNull LinkProperties newLp,
@NonNull LinkProperties oldLp) {
@Nullable LinkProperties oldLp) {
int netId = networkAgent.network.getNetId();
// The NetworkAgent does not know whether clatd is running on its network or not, or whether
@@ -7552,7 +7552,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
// Start or stop DNS64 detection and 464xlat according to network state.
networkAgent.clatd.update();
notifyIfacesChangedForNetworkStats();
// Notify NSS when relevant events happened. Currently, NSS only cares about
// interface changed to update clat interfaces accounting.
final boolean interfacesChanged = oldLp == null
|| !Objects.equals(newLp.getAllInterfaceNames(), oldLp.getAllInterfaceNames());
if (interfacesChanged) {
notifyIfacesChangedForNetworkStats();
}
networkAgent.networkMonitor().notifyLinkPropertiesChanged(
new LinkProperties(newLp, true /* parcelSensitiveFields */));
notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED);
@@ -8315,7 +8321,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
}
public void handleUpdateLinkProperties(NetworkAgentInfo nai, LinkProperties newLp) {
public void handleUpdateLinkProperties(@NonNull NetworkAgentInfo nai,
@NonNull LinkProperties newLp) {
ensureRunningOnConnectivityServiceThread();
if (!mNetworkAgentInfos.contains(nai)) {