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

Commit 28d06529 authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Clarify doc comment for setUnlockedDeviceRequired" am: a0976a12 am:... 

Merge "Clarify doc comment for setUnlockedDeviceRequired" am: a0976a12 am: f6354a20 am: 9025d607 am: 90099ff8

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



Change-Id: Ifde97f4de7924626d10ef6ea2a51949e5a809b35
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2799663 90099ff8

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

+2 −2
Original line number Diff line number Diff line
@@ -1637,8 +1637,8 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu 
         * Sets whether the keystore requires the screen to be unlocked before allowing decryption

         * using this key. If this is set to {@code true}, any attempt to decrypt or sign using this

         * key while the screen is locked will fail. A locked device requires a PIN, password,

         * biometric, or other trusted factor to access. While the screen is locked, the key can

         * still be used for encryption or signature verification.

         * biometric, or other trusted factor to access. While the screen is locked, any associated

         * public key can still be used (e.g for signature verification).

         */

        @NonNull

        public Builder setUnlockedDeviceRequired(boolean unlockedDeviceRequired) {