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

Commit d671ff59 authored by Aaron Huang's avatar Aaron Huang
Browse files

Use public resouce in android.R package 

Use public resource since IpSec is planed to be moved into
Connectivity mainline module.

Bug: 204153604
Test: build
Change-Id: I0aafef6b9b08307c3aebce597a2dd24925c6b09a
Merged-In: I0aafef6b9b08307c3aebce597a2dd24925c6b09a
parent 1d0076b3

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

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

        // Load and validate the optional algorithm resource. Undefined or duplicate algorithms in

        // the resource are not allowed.

        // the resource are not allowed.

        final String[] resourceAlgos = systemResources.getStringArray(

        final String[] resourceAlgos = systemResources.getStringArray(

                com.android.internal.R.array.config_optionalIpSecAlgorithms);

                android.R.array.config_optionalIpSecAlgorithms);

        for (String str : resourceAlgos) {

        for (String str : resourceAlgos) {

            if (!ALGO_TO_REQUIRED_FIRST_SDK.containsKey(str) || !enabledAlgos.add(str)) {

            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

                // This error should be caught by CTS and never be thrown to API callers