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

Ignore checking TRANSPORT_USB when Android version is older than S

Browse Source 
There is a new transport type - TRANSPORT_USB(8) in Android S,
so when the test tries to add this new transport type in older
Android version, it cannot pass the transport type validation and
make test fail.

(clean cherry-pick of change in downstream branch history)
Original change ID before project move:
I38816173b04ea198d99f64f45e9271ac2641e4ac

Bug: 184158327
Test: run CtsNetTestCasesLatestSdk on Android R & Q
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: Ib0368241771d287c09c0e4463f91122533f85a27
This commit is contained in:
lucaslin
2021-04-01 18:08:02 +08:00
committed by Remi NGUYEN VAN
parent 097d65b0f3
commit eadb0add66
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/common/java/android/net/NetworkCapabilitiesTest.java
View File

@@ -49,6 +49,7 @@ import static android.os.Process.INVALID_UID;
import static com.android.modules.utils.build.SdkLevel.isAtLeastR; import static com.android.modules.utils.build.SdkLevel.isAtLeastR;
import static com.android.modules.utils.build.SdkLevel.isAtLeastS; import static com.android.modules.utils.build.SdkLevel.isAtLeastS;
import static com.android.net.module.util.NetworkCapabilitiesUtils.TRANSPORT_USB;
import static com.android.testutils.MiscAsserts.assertEmpty; import static com.android.testutils.MiscAsserts.assertEmpty;
import static com.android.testutils.MiscAsserts.assertThrows; import static com.android.testutils.MiscAsserts.assertThrows;
import static com.android.testutils.ParcelUtils.assertParcelSane; import static com.android.testutils.ParcelUtils.assertParcelSane;
@@ -973,6 +974,11 @@ public class NetworkCapabilitiesTest {
assertNotEquals(512, nc.getLinkUpstreamBandwidthKbps()); assertNotEquals(512, nc.getLinkUpstreamBandwidthKbps());
} }
private int getMaxTransport() {
if (!isAtLeastS() && MAX_TRANSPORT == TRANSPORT_USB) return MAX_TRANSPORT - 1;
return MAX_TRANSPORT;
}
@Test @Test
public void testSignalStrength() { public void testSignalStrength() {
final NetworkCapabilities nc = new NetworkCapabilities(); final NetworkCapabilities nc = new NetworkCapabilities();
@@ -984,7 +990,7 @@ public class NetworkCapabilitiesTest {
} }
private void assertNoTransport(NetworkCapabilities nc) { private void assertNoTransport(NetworkCapabilities nc) {
for (int i = MIN_TRANSPORT; i <= MAX_TRANSPORT; i++) { for (int i = MIN_TRANSPORT; i <= getMaxTransport(); i++) {
assertFalse(nc.hasTransport(i)); assertFalse(nc.hasTransport(i));
} }
} }
@@ -1001,7 +1007,7 @@ public class NetworkCapabilitiesTest {
assertFalse(nc.hasTransport(i)); assertFalse(nc.hasTransport(i));
} }
} }
for (int i = MAX_TRANSPORT; i > maxTransportType; i--) { for (int i = getMaxTransport(); i > maxTransportType; i--) {
if (positiveSequence) { if (positiveSequence) {
assertFalse(nc.hasTransport(i)); assertFalse(nc.hasTransport(i));
} else { } else {
@@ -1015,12 +1021,12 @@ public class NetworkCapabilitiesTest {
final NetworkCapabilities nc = new NetworkCapabilities(); final NetworkCapabilities nc = new NetworkCapabilities();
assertNoTransport(nc); assertNoTransport(nc);
// Test adding multiple transport types. // Test adding multiple transport types.
for (int i = MIN_TRANSPORT; i <= MAX_TRANSPORT; i++) { for (int i = MIN_TRANSPORT; i <= getMaxTransport(); i++) {
nc.addTransportType(i); nc.addTransportType(i);
checkCurrentTransportTypes(nc, i, true /* positiveSequence */); checkCurrentTransportTypes(nc, i, true /* positiveSequence */);
} }
// Test removing multiple transport types. // Test removing multiple transport types.
for (int i = MIN_TRANSPORT; i <= MAX_TRANSPORT; i++) { for (int i = MIN_TRANSPORT; i <= getMaxTransport(); i++) {
nc.removeTransportType(i); nc.removeTransportType(i);
checkCurrentTransportTypes(nc, i, false /* positiveSequence */); checkCurrentTransportTypes(nc, i, false /* positiveSequence */);
} }