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

Commit f0271400 authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: b9fdfa82 am:... 

Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: b9fdfa82 am: a5d4ead8 am: f69232e8 am: 306b326b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb782e1fa403c8215a8f854791306019bd92696a
parents 426157ed 306b326b

core/java/android/net/IpSecAlgorithm.java

+4 −5
Original line number Diff line number Diff line
@@ -232,11 +232,10 @@ public final class IpSecAlgorithm implements Parcelable { 
        ALGO_TO_REQUIRED_FIRST_SDK.put(AUTH_HMAC_SHA512, SDK_VERSION_ZERO);

        ALGO_TO_REQUIRED_FIRST_SDK.put(AUTH_CRYPT_AES_GCM, SDK_VERSION_ZERO);



        // STOPSHIP: b/170424293 Use Build.VERSION_CODES.S when it is defined

        ALGO_TO_REQUIRED_FIRST_SDK.put(CRYPT_AES_CTR, Build.VERSION_CODES.R + 1);

        ALGO_TO_REQUIRED_FIRST_SDK.put(AUTH_AES_XCBC, Build.VERSION_CODES.R + 1);

        ALGO_TO_REQUIRED_FIRST_SDK.put(AUTH_AES_CMAC, Build.VERSION_CODES.R + 1);

        ALGO_TO_REQUIRED_FIRST_SDK.put(AUTH_CRYPT_CHACHA20_POLY1305, Build.VERSION_CODES.R + 1);

        ALGO_TO_REQUIRED_FIRST_SDK.put(CRYPT_AES_CTR, Build.VERSION_CODES.S);

        ALGO_TO_REQUIRED_FIRST_SDK.put(AUTH_AES_XCBC, Build.VERSION_CODES.S);

        ALGO_TO_REQUIRED_FIRST_SDK.put(AUTH_AES_CMAC, Build.VERSION_CODES.S);

        ALGO_TO_REQUIRED_FIRST_SDK.put(AUTH_CRYPT_CHACHA20_POLY1305, Build.VERSION_CODES.S);

    }



    private static final Set<String> ENABLED_ALGOS =