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

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

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

Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"" am: aef89adf am: b331ee3f am: 84047d72 am: b84834df

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3fcb639c714b5dba8070d04f471c5507f3b51f3d
parents 753e7770 b84834df

core/java/android/net/IpSecAlgorithm.java

+5 −4
Original line number Diff line number Diff line
@@ -232,10 +232,11 @@ 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);



        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);

        // 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);

    }



    private static final Set<String> ENABLED_ALGOS =