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

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

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" into main am: f32761d8 am: 5211c02d am: d7e8e59f am: 1dcf759e

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



Change-Id: I2f14cc458e3b97b7cc56c1aa97bb75f06e519540
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f023265b 1dcf759e

keystore/java/android/security/keystore/KeyGenParameterSpec.java

+1 −1
Original line number Diff line number Diff line
@@ -1524,7 +1524,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu 
         * key has purpose {@link android.security.keystore.KeyProperties#PURPOSE_SIGN}. If the key

         * does not have purpose {@link android.security.keystore.KeyProperties#PURPOSE_SIGN}, it is

         * not possible to use the key to sign a certificate, so the public key certificate will

         * contain a dummy signature.

         * contain a placeholder signature.

         *

         * <p>Symmetric keys, such as AES and HMAC keys, do not have public key certificates. If a

         * {@link #getAttestationChallenge()} returns non-null and the spec is used to generate a