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