Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18b7b7b3 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ib37e4bb14b57af06366dc31ba36f6883a56d7fb3
parents 845cbd1a c110082a

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

+1 −1
Original line number Diff line number Diff line
@@ -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