Merge "Fix documentation for config_optionalIpSecAlgorithms" am: 0bfaac54ab am: 9baae735b8 am: ce71ee6ed7

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

Change-Id: I40c9e8735025e7801c91eb50b2a8e770c0d23477
This commit is contained in:
Treehugger Robot
2020-11-03 03:38:26 +00:00
committed by Automerger Merge Worker

View File

@@ -1678,7 +1678,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">