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

Revert "Address comments on aosp/1550755" am: f77bed6d95 am: 01218f193f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2882284d1a6c65da2e5e0ce0ef30c469b36229ec
This commit is contained in:
Remi NGUYEN VAN
2021-02-15 12:20:32 +00:00
committed by Automerger Merge Worker
parent 5d6f744551 01218f193f
commit e4ebb44543
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/cts/net/src/android/net/cts/NetworkRequestTest.java
View File

@@ -34,7 +34,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import android.annotation.NonNull;
import android.net.MacAddress; import android.net.MacAddress;
import android.net.MatchAllNetworkSpecifier; import android.net.MatchAllNetworkSpecifier;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
@@ -49,7 +48,6 @@ import android.util.ArraySet;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.modules.utils.build.SdkLevel;
import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
@@ -159,12 +157,6 @@ public class NetworkRequestTest {
.getRequestorPackageName()); .getRequestorPackageName());
} }
private void addNotVcnManagedCapability(@NonNull NetworkCapabilities nc) {
if (SdkLevel.isAtLeastS()) {
nc.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED);
}
}
@Test @Test
@IgnoreUpTo(Build.VERSION_CODES.Q) @IgnoreUpTo(Build.VERSION_CODES.Q)
public void testCanBeSatisfiedBy() { public void testCanBeSatisfiedBy() {
@@ -176,27 +168,27 @@ public class NetworkRequestTest {
final NetworkCapabilities capCellularMmsInternet = new NetworkCapabilities() final NetworkCapabilities capCellularMmsInternet = new NetworkCapabilities()
.addTransportType(TRANSPORT_CELLULAR) .addTransportType(TRANSPORT_CELLULAR)
.addCapability(NET_CAPABILITY_MMS) .addCapability(NET_CAPABILITY_MMS)
.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED)
.addCapability(NET_CAPABILITY_INTERNET); .addCapability(NET_CAPABILITY_INTERNET);
addNotVcnManagedCapability(capCellularMmsInternet);
final NetworkCapabilities capCellularVpnMmsInternet = final NetworkCapabilities capCellularVpnMmsInternet =
new NetworkCapabilities(capCellularMmsInternet).addTransportType(TRANSPORT_VPN); new NetworkCapabilities(capCellularMmsInternet).addTransportType(TRANSPORT_VPN)
addNotVcnManagedCapability(capCellularVpnMmsInternet); .addCapability(NET_CAPABILITY_NOT_VCN_MANAGED);
final NetworkCapabilities capCellularMmsInternetSpecifier1 = final NetworkCapabilities capCellularMmsInternetSpecifier1 =
new NetworkCapabilities(capCellularMmsInternet).setNetworkSpecifier(specifier1); new NetworkCapabilities(capCellularMmsInternet).setNetworkSpecifier(specifier1)
addNotVcnManagedCapability(capCellularMmsInternetSpecifier1); .addCapability(NET_CAPABILITY_NOT_VCN_MANAGED);
final NetworkCapabilities capVpnInternetSpecifier1 = new NetworkCapabilities() final NetworkCapabilities capVpnInternetSpecifier1 = new NetworkCapabilities()
.addCapability(NET_CAPABILITY_INTERNET) .addCapability(NET_CAPABILITY_INTERNET)
.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED)
.addTransportType(TRANSPORT_VPN) .addTransportType(TRANSPORT_VPN)
.setNetworkSpecifier(specifier1); .setNetworkSpecifier(specifier1);
addNotVcnManagedCapability(capVpnInternetSpecifier1);
final NetworkCapabilities capCellularMmsInternetMatchallspecifier = final NetworkCapabilities capCellularMmsInternetMatchallspecifier =
new NetworkCapabilities(capCellularMmsInternet) new NetworkCapabilities(capCellularMmsInternet)
.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED)
.setNetworkSpecifier(new MatchAllNetworkSpecifier()); .setNetworkSpecifier(new MatchAllNetworkSpecifier());
addNotVcnManagedCapability(capCellularMmsInternetMatchallspecifier);
final NetworkCapabilities capCellularMmsInternetSpecifier2 = final NetworkCapabilities capCellularMmsInternetSpecifier2 =
new NetworkCapabilities(capCellularMmsInternet) new NetworkCapabilities(capCellularMmsInternet)
.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED)
.setNetworkSpecifier(specifier2); .setNetworkSpecifier(specifier2);
addNotVcnManagedCapability(capCellularMmsInternetSpecifier2);
final NetworkRequest requestCellularInternetSpecifier1 = new NetworkRequest.Builder() final NetworkRequest requestCellularInternetSpecifier1 = new NetworkRequest.Builder()
.addTransportType(TRANSPORT_CELLULAR) .addTransportType(TRANSPORT_CELLULAR)
@@ -261,8 +253,8 @@ public class NetworkRequestTest {
final NetworkCapabilities capCellInternetBWSpecifier1Signal = final NetworkCapabilities capCellInternetBWSpecifier1Signal =
new NetworkCapabilities.Builder(capCellInternetBWSpecifier1) new NetworkCapabilities.Builder(capCellInternetBWSpecifier1)
.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED)
.setSignalStrength(-123).build(); .setSignalStrength(-123).build();
addNotVcnManagedCapability(capCellInternetBWSpecifier1Signal);
assertCorrectlySatisfies(true, requestCombination, assertCorrectlySatisfies(true, requestCombination,
capCellInternetBWSpecifier1Signal); capCellInternetBWSpecifier1Signal);
@@ -297,8 +289,6 @@ public class NetworkRequestTest {
.clearCapabilities().build().getRequestorUid()); .clearCapabilities().build().getRequestorUid());
} }
// TODO: 1. Refactor test cases with helper method.
// 2. Test capability that does not yet exist.
@Test @IgnoreUpTo(Build.VERSION_CODES.R) @Test @IgnoreUpTo(Build.VERSION_CODES.R)
public void testBypassingVcnForNonInternetRequest() { public void testBypassingVcnForNonInternetRequest() {
// Make an empty request. Verify the NOT_VCN_MANAGED is added. // Make an empty request. Verify the NOT_VCN_MANAGED is added.