| commit | 27a963097f8b507277e3c67b144aa799eceac542 | [log] [tgz] |
|---|---|---|
| author | Aaron Huang <huangaaron@google.com> | Wed Jan 26 15:28:33 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 26 15:28:33 2022 +0000 |
| tree | 54c0fdf3673da186486b04a4d2ccb7dd90a69aac | |
| parent | c0fc62791747a22b40ac45ec15b741ca4bd9169f [diff] | |
| parent | 873edfa5b4fc8abec927927ae39a88fb19f129b6 [diff] |
Merge "Use public resouce in android.R package" am: 17a9e07870 am: 873edfa5b4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956980 Change-Id: I91166422527512f95475a5d66599b0509ceaf7f8
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