Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use public resouce in android.R package" am: c110082aef

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956980

Change-Id: Ib37e4bb14b57af06366dc31ba36f6883a56d7fb3
This commit is contained in:
Aaron Huang
2022-01-26 15:17:11 +00:00
committed by Automerger Merge Worker
parent 845cbd1a71 c110082aef
commit 18b7b7b386
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/ConnectivityT/framework-t/src/android/net/IpSecAlgorithm.java
View File

@@ -343,7 +343,7 @@ public final class IpSecAlgorithm implements Parcelable {
// 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