Merge "trivialize apf property accessor dead code"
diff --git a/framework/src/android/net/apf/ApfCapabilities.java b/framework/src/android/net/apf/ApfCapabilities.java
index 663c1b3..64f14a1 100644
--- a/framework/src/android/net/apf/ApfCapabilities.java
+++ b/framework/src/android/net/apf/ApfCapabilities.java
@@ -133,9 +133,7 @@
public static boolean getApfDrop8023Frames() {
// TODO: deprecate/remove this method (now unused in the platform), as the resource was
// moved to NetworkStack.
- final Resources systemRes = Resources.getSystem();
- final int id = systemRes.getIdentifier("config_apfDrop802_3Frames", "bool", "android");
- return systemRes.getBoolean(id);
+ return true;
}
/**
@@ -144,8 +142,6 @@
public static @NonNull int[] getApfEtherTypeBlackList() {
// TODO: deprecate/remove this method (now unused in the platform), as the resource was
// moved to NetworkStack.
- final Resources systemRes = Resources.getSystem();
- final int id = systemRes.getIdentifier("config_apfEthTypeBlackList", "array", "android");
- return systemRes.getIntArray(id);
+ return new int[] { 0x88a2, 0x88a4, 0x88b8, 0x88cd, 0x88e3 };
}
}
diff --git a/tests/common/java/android/net/apf/ApfCapabilitiesTest.java b/tests/common/java/android/net/apf/ApfCapabilitiesTest.java
index fa4adcb..8c2ec40 100644
--- a/tests/common/java/android/net/apf/ApfCapabilitiesTest.java
+++ b/tests/common/java/android/net/apf/ApfCapabilitiesTest.java
@@ -33,6 +33,7 @@
import androidx.test.runner.AndroidJUnit4;
import com.android.testutils.DevSdkIgnoreRule;
+import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import org.junit.Before;
@@ -83,7 +84,11 @@
assertTrue(caps.hasDataAccess());
}
- @Test
+ // the property is deleted in U, on S & T getApfDrop8023Frames() is mainline and
+ // hardcoded to return true, so this simply verifies the unused property is also true,
+ // as modifying it would not take effect. For S+ change NetworkStack's
+ // config_apfDrop802_3Frames instead.
+ @Test @IgnoreAfter(Build.VERSION_CODES.TIRAMISU)
public void testGetApfDrop8023Frames() {
// Get com.android.internal.R.bool.config_apfDrop802_3Frames. The test cannot directly
// use R.bool.config_apfDrop802_3Frames because that is not a stable resource ID.
@@ -105,7 +110,11 @@
ApfCapabilities.getApfDrop8023Frames());
}
- @Test
+ // the property is deleted in U, on S & T getApfEtherTypeBlackList() is mainline and
+ // hardcoded to return a specific default set of ethertypes, so this simply verifies
+ // that the unused property hasn't been changed away from the default, as it would
+ // not take effect. For S+ change NetworkStack's config_apfEthTypeDenyList instead.
+ @Test @IgnoreAfter(Build.VERSION_CODES.TIRAMISU)
public void testGetApfEtherTypeBlackList() {
// Get com.android.internal.R.array.config_apfEthTypeBlackList. The test cannot directly
// use R.array.config_apfEthTypeBlackList because that is not a stable resource ID.