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

Commit d94c9635 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski
Browse files

replace R + 1 with S 



Test: TreeHugger
Bug: 170424293
Signed-off-by: default avatarMaciej Żenczykowski <maze@google.com>
Change-Id: Ic28aa1a568bbd0b6d4f06abb7294415afd695fff
parent 1cfd0c75

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 =