joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Pass the NetworkAgentConfig to NetworkMonitor." am: ec05b337aa

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1973860

Change-Id: I632b38bacd43ce03b95a163b4742b1a414b79012
This commit is contained in:
Jean Chalard 2022-02-09 17:12:02 +00:00 • committed by Automerger Merge Worker
commit 33235c723e
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
service/src/com/android/server/ConnectivityService.java
View file

@ -191,6 +191,7 @@ import android.net.metrics.NetworkEvent;
import android.net.netd.aidl.NativeUidRangeConfig;
import android.net.networkstack.ModuleNetworkStackClient;
import android.net.networkstack.NetworkStackClientBase;
import android.net.networkstack.aidl.NetworkMonitorParameters;
import android.net.resolv.aidl.DnsHealthEventParcel;
import android.net.resolv.aidl.IDnsResolverUnsolicitedEventListener;
import android.net.resolv.aidl.Nat64PrefixEventParcel;
@ -8883,10 +8884,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (networkAgent.networkAgentConfig.acceptPartialConnectivity) {
networkAgent.networkMonitor().setAcceptPartialConnectivity();
}
networkAgent.networkMonitor().notifyNetworkConnected(
new LinkProperties(networkAgent.linkProperties,
true /* parcelSensitiveFields */),
networkAgent.networkCapabilities);
final NetworkMonitorParameters params = new NetworkMonitorParameters();
params.networkAgentConfig = networkAgent.networkAgentConfig;
params.networkCapabilities = networkAgent.networkCapabilities;
params.linkProperties = new LinkProperties(networkAgent.linkProperties,
true /* parcelSensitiveFields */);
networkAgent.networkMonitor().notifyNetworkConnected(params);
scheduleUnvalidatedPrompt(networkAgent);
// Whether a particular NetworkRequest listen should cause signal strength thresholds to

2
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View file

@ -907,7 +907,7 @@ public class ConnectivityServiceTest {
return null;
};
doAnswer(validateAnswer).when(mNetworkMonitor).notifyNetworkConnected(any(), any());
doAnswer(validateAnswer).when(mNetworkMonitor).notifyNetworkConnectedParcel(any());
doAnswer(validateAnswer).when(mNetworkMonitor).forceReevaluation(anyInt());
final ArgumentCaptor<Network> nmNetworkCaptor = ArgumentCaptor.forClass(Network.class);