| commit | 982f40877f5ee3f8f8029cf67189743f1d171d70 | [log] [tgz] |
|---|---|---|
| author | Aaron Huang <huangaaron@google.com> | Wed Jan 26 15:42:28 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 26 15:42:28 2022 +0000 |
| tree | 54c0fdf3673da186486b04a4d2ccb7dd90a69aac | |
| parent | d596b1615622a13480e69b7b65e47487dbf25d9b [diff] | |
| parent | 27a963097f8b507277e3c67b144aa799eceac542 [diff] |
Merge "Use public resouce in android.R package" am: 17a9e07870 am: 873edfa5b4 am: 27a963097f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956980 Change-Id: I9e80790dab7ddf569ef81ca1287ae13461a3d544
diff --git a/framework-t/src/android/net/IpSecAlgorithm.java b/framework-t/src/android/net/IpSecAlgorithm.java index a84e7a9..10a22ac 100644 --- a/framework-t/src/android/net/IpSecAlgorithm.java +++ b/framework-t/src/android/net/IpSecAlgorithm.java
@@ -343,7 +343,7 @@ // Load and validate the optional algorithm resource. Undefined or duplicate algorithms in // the resource are not allowed. final String[] resourceAlgos = systemResources.getStringArray( - com.android.internal.R.array.config_optionalIpSecAlgorithms); + android.R.array.config_optionalIpSecAlgorithms); for (String str : resourceAlgos) { if (!ALGO_TO_REQUIRED_FIRST_SDK.containsKey(str) || !enabledAlgos.add(str)) { // This error should be caught by CTS and never be thrown to API callers