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

Merge "Move config_apf* resources to NetworkStack" am: c52f4eb2c6 am: 8f0380f066

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684656

Change-Id: I93f5fd10f6c365365ff0e89ca4221d58d420c5ac
This commit is contained in:
Remi NGUYEN VAN
2021-05-19 03:11:41 +00:00
committed by Automerger Merge Worker
parent ecf93ebf39 8f0380f066
commit 159c362b21
4 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/common/java/android/net/apf/ApfCapabilitiesTest.java
View File

@@ -18,6 +18,7 @@ package android.net.apf;
import static com.android.testutils.ParcelUtils.assertParcelSane;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
@@ -25,12 +26,17 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import android.content.Context;
import android.os.Build;
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -39,6 +45,9 @@ import java.util.Arrays;
@RunWith(AndroidJUnit4.class)
@SmallTest
public class ApfCapabilitiesTest {
@Rule
public final DevSdkIgnoreRule mIgnoreRule = new DevSdkIgnoreRule();
private Context mContext;
@Before
@@ -85,6 +94,17 @@ public class ApfCapabilitiesTest {
assertEquals(shouldDrop8023Frames, actual);
}
@Test @IgnoreUpTo(Build.VERSION_CODES.R)
public void testGetApfDrop8023Frames_S() {
// IpClient does not call getApfDrop8023Frames() since S, so any customization of the return
// value on S+ is a configuration error as it will not be used by IpClient.
assertTrue("android.R.bool.config_apfDrop802_3Frames has been modified to false, but "
+ "starting from S its value is not used by IpClient. If the modification is "
+ "intentional, use a runtime resource overlay for the NetworkStack package to "
+ "overlay com.android.networkstack.R.bool.config_apfDrop802_3Frames instead.",
ApfCapabilities.getApfDrop8023Frames());
}
@Test
public void testGetApfEtherTypeBlackList() {
// Get com.android.internal.R.array.config_apfEthTypeBlackList. The test cannot directly
@@ -96,4 +116,17 @@ public class ApfCapabilitiesTest {
assertNotNull(actual);
assertTrue(Arrays.equals(blacklistedEtherTypeArray, actual));
}
@Test @IgnoreUpTo(Build.VERSION_CODES.R)
public void testGetApfEtherTypeBlackList_S() {
// IpClient does not call getApfEtherTypeBlackList() since S, so any customization of the
// return value on S+ is a configuration error as it will not be used by IpClient.
assertArrayEquals("android.R.array.config_apfEthTypeBlackList has been modified, but "
+ "starting from S its value is not used by IpClient. If the modification "
+ "is intentional, use a runtime resource overlay for the NetworkStack "
+ "package to overlay "
+ "com.android.networkstack.R.array.config_apfEthTypeDenyList instead.",
new int[] { 0x88a2, 0x88a4, 0x88b8, 0x88cd, 0x88e3 },
ApfCapabilities.getApfEtherTypeBlackList());
}
}