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

Fix a bug where listen callbacks would not be called

Browse Source 
NetworkAgentInfos cache the list of requests they satisfy,
and that list is used to send callbacks. Therefore, when
the TRACK_DEFAULTs are copied, this list needs to be
updated.

The best way to do this is to figure out what was the old
active request and find which requests corresponds to it
in the new list, and then upon registering adding the
active request to the relevant satisfier if present.

A few other ways can be considered like replacing the
request as it gets added, but this would temporarily
increase the number of callbacks allocated to the app
and risks crashing it for no good reason ; furthermore
the call to remove would have to be eschewed somehow
for those requests that are replaced. This is much
simpler.

Test: new test for this. This also passes the future
      tests for per-profile default network preference.
Change-Id: I001351e5c478c2c77cbf2844abca77b205291778
This commit is contained in:
Chalard Jean
2021-03-05 19:18:14 +09:00
parent 557708171c
commit b5becbca0a
2 changed files with 54 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -72,6 +72,7 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE;
import static android.net.NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY;
import static android.net.NetworkCapabilities.NET_CAPABILITY_RCS;
import static android.net.NetworkCapabilities.NET_CAPABILITY_SUPL;
import static android.net.NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED;
import static android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED;
import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
import static android.net.NetworkCapabilities.NET_CAPABILITY_WIFI_P2P;
@@ -5574,7 +5575,7 @@ public class ConnectivityServiceTest {
reset(mStatsManager);
// Temp metered change shouldn't update ifaces
mCellNetworkAgent.addCapability(NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED);
mCellNetworkAgent.addCapability(NET_CAPABILITY_TEMPORARILY_NOT_METERED);
waitForIdle();
verify(mStatsManager, never()).notifyNetworkStatus(eq(Arrays.asList(onlyCell)),
any(List.class), eq(MOBILE_IFNAME), any(List.class));
@@ -10647,7 +10648,7 @@ public class ConnectivityServiceTest {
null,
null);
// default NCs will be unregistered in tearDown
// default callbacks will be unregistered in tearDown
}
/**
@@ -10704,7 +10705,7 @@ public class ConnectivityServiceTest {
null,
mService.mNoServiceNetwork.network());
// default NCs will be unregistered in tearDown
// default callbacks will be unregistered in tearDown
}
/**
@@ -10763,7 +10764,7 @@ public class ConnectivityServiceTest {
null,
mService.mNoServiceNetwork.network());
// default NCs will be unregistered in tearDown
// default callbacks will be unregistered in tearDown
}
/**
@@ -10822,7 +10823,28 @@ public class ConnectivityServiceTest {
null,
mService.mNoServiceNetwork.network());
// default NCs will be unregistered in tearDown
// default callbacks will be unregistered in tearDown
}
@Test
public void testCapabilityWithOemNetworkPreference() throws Exception {
@OemNetworkPreferences.OemNetworkPreference final int networkPref =
OemNetworkPreferences.OEM_NETWORK_PREFERENCE_OEM_PRIVATE_ONLY;
setupMultipleDefaultNetworksForOemNetworkPreferenceNotCurrentUidTest(networkPref);
registerDefaultNetworkCallbacks();
setOemNetworkPreferenceAgentConnected(TRANSPORT_CELLULAR, true);
mSystemDefaultNetworkCallback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent);
mDefaultNetworkCallback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent);
mCellNetworkAgent.addCapability(NET_CAPABILITY_TEMPORARILY_NOT_METERED);
mSystemDefaultNetworkCallback.expectCapabilitiesThat(mCellNetworkAgent, nc ->
nc.hasCapability(NET_CAPABILITY_TEMPORARILY_NOT_METERED));
mDefaultNetworkCallback.expectCapabilitiesThat(mCellNetworkAgent, nc ->
nc.hasCapability(NET_CAPABILITY_TEMPORARILY_NOT_METERED));
// default callbacks will be unregistered in tearDown
}
@Test