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

Merge changes I0789d9bd,Idf4cf74a

Browse Source 
* changes:
  Disable ignoring validation on roam just after boot.
  Minor cleanups for ignore validation failures after roam tests.
This commit is contained in:
Treehugger Robot
2022-10-25 02:15:29 +00:00
committed by Gerrit Code Review
parent 9b9e2911bc 580d0d53be
commit a40faea28d
2 changed files with 80 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -368,7 +368,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
private static final int DEFAULT_NASCENT_DELAY_MS = 5_000;
// The maximum value for the blocking validation result, in milliseconds.
public static final int MAX_VALIDATION_FAILURE_BLOCKING_TIME_MS = 10000;
public static final int MAX_VALIDATION_IGNORE_AFTER_ROAM_TIME_MS = 10000;
// The maximum number of network request allowed per uid before an exception is thrown.
@VisibleForTesting
@@ -4241,12 +4241,18 @@ public class ConnectivityService extends IConnectivityManager.Stub
return nai.isCreated() && !nai.isDestroyed();
}
private boolean shouldIgnoreValidationFailureAfterRoam(NetworkAgentInfo nai) {
@VisibleForTesting
boolean shouldIgnoreValidationFailureAfterRoam(NetworkAgentInfo nai) {
// T+ devices should use unregisterAfterReplacement.
if (SdkLevel.isAtLeastT()) return false;
// If the network never roamed, return false. The check below is not sufficient if time
// since boot is less than blockTimeOut, though that's extremely unlikely to happen.
if (nai.lastRoamTime == 0) return false;
final long blockTimeOut = Long.valueOf(mResources.get().getInteger(
R.integer.config_validationFailureAfterRoamIgnoreTimeMillis));
if (blockTimeOut <= MAX_VALIDATION_FAILURE_BLOCKING_TIME_MS
if (blockTimeOut <= MAX_VALIDATION_IGNORE_AFTER_ROAM_TIME_MS
&& blockTimeOut >= 0) {
final long currentTimeMs = SystemClock.elapsedRealtime();
long timeSinceLastRoam = currentTimeMs - nai.lastRoamTime;
@@ -9774,8 +9780,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
return ((VpnTransportInfo) ti).getType();
}
private void maybeUpdateWifiRoamTimestamp(NetworkAgentInfo nai, NetworkCapabilities nc) {
if (nai == null) return;
private void maybeUpdateWifiRoamTimestamp(@NonNull NetworkAgentInfo nai,
@NonNull NetworkCapabilities nc) {
final TransportInfo prevInfo = nai.networkCapabilities.getTransportInfo();
final TransportInfo newInfo = nc.getTransportInfo();
if (!(prevInfo instanceof WifiInfo) || !(newInfo instanceof WifiInfo)) {

74
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -16782,23 +16782,25 @@ public class ConnectivityServiceTest {
assertThrows(NullPointerException.class, () -> mService.unofferNetwork(null));
}
public void doTestIgnoreValidationAfterRoam(final boolean enabled) throws Exception {
assumeFalse(SdkLevel.isAtLeastT());
doReturn(enabled ? 5000 : -1).when(mResources)
public void doTestIgnoreValidationAfterRoam(int resValue, final boolean enabled)
throws Exception {
doReturn(resValue).when(mResources)
.getInteger(R.integer.config_validationFailureAfterRoamIgnoreTimeMillis);
final String bssid1 = "AA:AA:AA:AA:AA:AA";
final String bssid2 = "BB:BB:BB:BB:BB:BB";
mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR);
mCellNetworkAgent.connect(true);
NetworkCapabilities wifiNc1 = new NetworkCapabilities()
.addCapability(NET_CAPABILITY_INTERNET)
.addCapability(NET_CAPABILITY_NOT_VPN)
.addCapability(NET_CAPABILITY_NOT_RESTRICTED)
.addCapability(NET_CAPABILITY_TRUSTED)
.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED)
.addTransportType(TRANSPORT_WIFI)
.setTransportInfo(new WifiInfo.Builder().setBssid("AA:AA:AA:AA:AA:AA").build());
NetworkCapabilities wifiNc2 = new NetworkCapabilities()
.addCapability(NET_CAPABILITY_INTERNET)
.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED)
.addTransportType(TRANSPORT_WIFI)
.setTransportInfo(new WifiInfo.Builder().setBssid("BB:BB:BB:BB:BB:BB").build());
.setTransportInfo(new WifiInfo.Builder().setBssid(bssid1).build());
NetworkCapabilities wifiNc2 = new NetworkCapabilities(wifiNc1)
.setTransportInfo(new WifiInfo.Builder().setBssid(bssid2).build());
final LinkProperties wifiLp = new LinkProperties();
wifiLp.setInterfaceName(WIFI_IFNAME);
mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI, wifiLp, wifiNc1);
@@ -16862,6 +16864,7 @@ public class ConnectivityServiceTest {
wifiNetworkCallback.expectCapabilitiesWithout(NET_CAPABILITY_PARTIAL_CONNECTIVITY,
mWiFiNetworkAgent);
}
mCm.unregisterNetworkCallback(wifiNetworkCallback);
// Wi-Fi roams from wifiNc1 to wifiNc2, and now becomes really invalid. If validation
// failures after roam are not ignored, this will cause cell to become the default network.
@@ -16872,11 +16875,7 @@ public class ConnectivityServiceTest {
mWiFiNetworkAgent.setNetworkInvalid(false /* isStrictMode */);
mCm.reportNetworkConnectivity(mWiFiNetworkAgent.getNetwork(), false);
if (!enabled) {
mDefaultNetworkCallback.expectAvailableCallbacksValidated(mCellNetworkAgent);
return;
}
if (enabled) {
// Network validation failed, but the result will be ignored.
assertTrue(mCm.getNetworkCapabilities(mWiFiNetworkAgent.getNetwork()).hasCapability(
NET_CAPABILITY_VALIDATED));
@@ -16892,19 +16891,60 @@ public class ConnectivityServiceTest {
waitForValidationBlock.block(150);
mCm.reportNetworkConnectivity(mWiFiNetworkAgent.getNetwork(), false);
mDefaultNetworkCallback.expectAvailableCallbacksValidated(mCellNetworkAgent);
} else {
mDefaultNetworkCallback.expectAvailableCallbacksValidated(mCellNetworkAgent);
}
// Wi-Fi is still connected and would become the default network if cell were to
// disconnect. This assertion ensures that the switch to cellular was not caused by
// Wi-Fi disconnecting (e.g., because the capability change to wifiNc2 caused it
// to stop satisfying the default request).
mCellNetworkAgent.disconnect();
mDefaultNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent);
mDefaultNetworkCallback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent);
mCm.unregisterNetworkCallback(wifiNetworkCallback);
}
@Test
public void testIgnoreValidationAfterRoamDisabled() throws Exception {
doTestIgnoreValidationAfterRoam(false /* enabled */);
doTestIgnoreValidationAfterRoam(-1, false /* enabled */);
}
@Test
public void testIgnoreValidationAfterRoamEnabled() throws Exception {
doTestIgnoreValidationAfterRoam(true /* enabled */);
final boolean enabled = !SdkLevel.isAtLeastT();
doTestIgnoreValidationAfterRoam(5_000, enabled);
}
@Test
public void testShouldIgnoreValidationFailureAfterRoam() {
// Always disabled on T+.
assumeFalse(SdkLevel.isAtLeastT());
NetworkAgentInfo nai = fakeWifiNai(new NetworkCapabilities());
// Enabled, but never roamed.
doReturn(5_000).when(mResources)
.getInteger(R.integer.config_validationFailureAfterRoamIgnoreTimeMillis);
assertEquals(0, nai.lastRoamTime);
assertFalse(mService.shouldIgnoreValidationFailureAfterRoam(nai));
// Roamed recently.
nai.lastRoamTime = SystemClock.elapsedRealtime() - 500 /* ms */;
assertTrue(mService.shouldIgnoreValidationFailureAfterRoam(nai));
// Disabled due to invalid setting (maximum is 10 seconds).
doReturn(15_000).when(mResources)
.getInteger(R.integer.config_validationFailureAfterRoamIgnoreTimeMillis);
assertFalse(mService.shouldIgnoreValidationFailureAfterRoam(nai));
// Disabled.
doReturn(-1).when(mResources)
.getInteger(R.integer.config_validationFailureAfterRoamIgnoreTimeMillis);
assertFalse(mService.shouldIgnoreValidationFailureAfterRoam(nai));
}
@Test
public void testLegacyTetheringApiGuardWithProperPermission() throws Exception {
final String testIface = "test0";