diff options
Diffstat (limited to 'tests/unit/java/android/net/IpSecAlgorithmTest.java')
| -rw-r--r-- | tests/unit/java/android/net/IpSecAlgorithmTest.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/unit/java/android/net/IpSecAlgorithmTest.java b/tests/unit/java/android/net/IpSecAlgorithmTest.java index c2a759b83a..c473e82945 100644 --- a/tests/unit/java/android/net/IpSecAlgorithmTest.java +++ b/tests/unit/java/android/net/IpSecAlgorithmTest.java @@ -217,8 +217,11 @@ public class IpSecAlgorithmTest { final Set<String> optionalAlgoSet = getOptionalAlgos(); final String[] optionalAlgos = optionalAlgoSet.toArray(new String[0]); - doReturn(optionalAlgos).when(mMockResources) - .getStringArray(com.android.internal.R.array.config_optionalIpSecAlgorithms); + // Query the identifier instead of using the R.array constant, as the test may be built + // separately from the platform and they may not match. + final int resId = Resources.getSystem().getIdentifier("config_optionalIpSecAlgorithms", + "array", "android"); + doReturn(optionalAlgos).when(mMockResources).getStringArray(resId); final Set<String> enabledAlgos = new HashSet<>(IpSecAlgorithm.loadAlgos(mMockResources)); final Set<String> expectedAlgos = ALGO_TO_REQUIRED_FIRST_SDK.keySet(); |
