diff options
| author | 2020-11-03 02:05:40 +0000 | |
|---|---|---|
| committer | 2020-11-03 02:05:40 +0000 | |
| commit | 0bfaac54ab1ebac38b5646f8f54db707d80721da (patch) | |
| tree | 09d1a2693860ae3daee3689054effcf2d299fb52 | |
| parent | 71d05369326d8f73388d2a4b58f313ee05c148a6 (diff) | |
| parent | 4a76d99ade8abc2a0581a4d0cbd3036e56ad02c1 (diff) | |
Merge "Fix documentation for config_optionalIpSecAlgorithms"
| -rw-r--r-- | core/res/res/values/config.xml | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 781bb2ad1857..4548f3aa6347 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1671,7 +1671,7 @@           to be explicitly declared in this resource to be enabled.               * SDK level 28 makes the following algorithms mandatory : "cbc(aes)", "hmac(md5)",                 "hmac(sha1)", "hmac(sha256)", "hmac(sha384)", "hmac(sha512)", "rfc4106(gcm(aes))" -             * SDK level 30 makes the following algorithms mandatory : "rfc3686(ctr(aes))", +             * SDK level 31 makes the following algorithms mandatory : "rfc3686(ctr(aes))",                 "xcbc(aes)", "rfc7539esp(chacha20,poly1305)"       -->      <string-array name="config_optionalIpSecAlgorithms" translatable="false">  |