LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "replace R + 1 with S" am: 7eb9f88a6e am: d5ad273033 am: 56d7b04870 am: 511e606557

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1888235

Change-Id: Iba216770137e1af79fabf3bf29d15044d07c3ef2
This commit is contained in:
Treehugger Robot
2021-11-11 08:31:31 +00:00
committed by Automerger Merge Worker
parent eae2769799 511e606557
commit 8f1c12a8f1
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/cts/net/src/android/net/cts/IpSecManagerTest.java
View File

@@ -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<String> supportedAlgos = IpSecAlgorithm.getSupportedAlgorithms();