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

Commit 5276a1d7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "replace R + 1 with S" am: 02842ed8 am: 0c736664 am: 022d9de8 am:... 

Merge "replace R + 1 with S" am: 02842ed8 am: 0c736664 am: 022d9de8 am: bbcbc3a5 am: 602dacc2

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

Change-Id: Ibc609f2730cd543e4b3da90ee2dd8d4e1defc6ee
parents c44fa145 602dacc2

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 =