From 8834250ef8696727298562e60c75a7a132a33cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Wed, 10 Nov 2021 18:19:10 -0800 Subject: [PATCH] replace R + 1 with S MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test: TreeHugger Bug: 170424293 Signed-off-by: Maciej Żenczykowski Change-Id: I43f53268b6c1605d928ce3431cc95b8a66b6c052 --- tests/cts/net/src/android/net/cts/IpSecManagerTest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/IpSecManagerTest.java b/tests/cts/net/src/android/net/cts/IpSecManagerTest.java index 7323c5900d..7bce3d2e5c 100644 --- a/tests/cts/net/src/android/net/cts/IpSecManagerTest.java +++ b/tests/cts/net/src/android/net/cts/IpSecManagerTest.java @@ -723,11 +723,10 @@ public class IpSecManagerTest extends IpSecBaseTest { algoToRequiredMinSdk.put(AUTH_HMAC_SHA512, Build.VERSION_CODES.P); algoToRequiredMinSdk.put(AUTH_CRYPT_AES_GCM, Build.VERSION_CODES.P); - // TODO: b/170424293 Use Build.VERSION_CODES.S when is finalized - algoToRequiredMinSdk.put(CRYPT_AES_CTR, Build.VERSION_CODES.R + 1); - algoToRequiredMinSdk.put(AUTH_AES_CMAC, Build.VERSION_CODES.R + 1); - algoToRequiredMinSdk.put(AUTH_AES_XCBC, Build.VERSION_CODES.R + 1); - algoToRequiredMinSdk.put(AUTH_CRYPT_CHACHA20_POLY1305, Build.VERSION_CODES.R + 1); + algoToRequiredMinSdk.put(CRYPT_AES_CTR, Build.VERSION_CODES.S); + algoToRequiredMinSdk.put(AUTH_AES_CMAC, Build.VERSION_CODES.S); + algoToRequiredMinSdk.put(AUTH_AES_XCBC, Build.VERSION_CODES.S); + algoToRequiredMinSdk.put(AUTH_CRYPT_CHACHA20_POLY1305, Build.VERSION_CODES.S); final Set supportedAlgos = IpSecAlgorithm.getSupportedAlgorithms();