Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce71ee6e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix documentation for config_optionalIpSecAlgorithms" am: 0bfaac54 am: 9baae735

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

Change-Id: I10b8cf5ebe2cdaee18f22f82aa47100c0ea9ff4c
parents 899c7623 9baae735
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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">