diff options
| author | 2021-03-03 20:22:42 +0000 | |
|---|---|---|
| committer | 2021-03-03 20:22:42 +0000 | |
| commit | 306b326b6ef58c16bb9dfa2271a05390127a06fd (patch) | |
| tree | b14f9a8035af8bfde1139f002cab9a25ddea1a37 | |
| parent | 57573115c3a525b08e1e7059e41ca58a8cb692cf (diff) | |
| parent | f69232e88b4762a97bc7a8b842540f6bb929affc (diff) | |
Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: b9fdfa8270 am: a5d4ead8ed am: f69232e88b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606597
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I057bfdf8528b6f801fd5eb7d0757f19e81efa9a0
| -rw-r--r-- | core/java/android/net/IpSecAlgorithm.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/java/android/net/IpSecAlgorithm.java b/core/java/android/net/IpSecAlgorithm.java index 8f1e2defd215..268002f1dd52 100644 --- a/core/java/android/net/IpSecAlgorithm.java +++ b/core/java/android/net/IpSecAlgorithm.java @@ -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 = |