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

Commit 1e0a9b0b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Enable "Unlocked device required" API" into pi-dev

parents 4ced90cb 9e874905

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -38567,6 +38567,7 @@ package android.security.keystore { 
    method public boolean isRandomizedEncryptionRequired();

    method public boolean isStrongBoxBacked();

    method public boolean isTrustedUserPresenceRequired();

    method public boolean isUnlockedDeviceRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationValidWhileOnBody();

    method public boolean isUserConfirmationRequired();
@@ -38594,6 +38595,7 @@ package android.security.keystore { 
    method public android.security.keystore.KeyGenParameterSpec.Builder setRandomizedEncryptionRequired(boolean);

    method public android.security.keystore.KeyGenParameterSpec.Builder setSignaturePaddings(java.lang.String...);

    method public android.security.keystore.KeyGenParameterSpec.Builder setTrustedUserPresenceRequired(boolean);

    method public android.security.keystore.KeyGenParameterSpec.Builder setUnlockedDeviceRequired(boolean);

    method public android.security.keystore.KeyGenParameterSpec.Builder setUserAuthenticationRequired(boolean);

    method public android.security.keystore.KeyGenParameterSpec.Builder setUserAuthenticationValidWhileOnBody(boolean);

    method public android.security.keystore.KeyGenParameterSpec.Builder setUserAuthenticationValidityDurationSeconds(int);
@@ -38686,6 +38688,7 @@ package android.security.keystore { 
    method public boolean isInvalidatedByBiometricEnrollment();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isTrustedUserPresenceRequired();

    method public boolean isUnlockedDeviceRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationValidWhileOnBody();

    method public boolean isUserConfirmationRequired();
@@ -38705,6 +38708,7 @@ package android.security.keystore { 
    method public android.security.keystore.KeyProtection.Builder setRandomizedEncryptionRequired(boolean);

    method public android.security.keystore.KeyProtection.Builder setSignaturePaddings(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setTrustedUserPresenceRequired(boolean);

    method public android.security.keystore.KeyProtection.Builder setUnlockedDeviceRequired(boolean);

    method public android.security.keystore.KeyProtection.Builder setUserAuthenticationRequired(boolean);

    method public android.security.keystore.KeyProtection.Builder setUserAuthenticationValidWhileOnBody(boolean);

    method public android.security.keystore.KeyProtection.Builder setUserAuthenticationValidityDurationSeconds(int);

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

+2 −2
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu 
    }



    /**

     * @hide Returns {@code true} if the key cannot be used unless the device screen is unlocked.

     * Returns {@code true} if the key cannot be used unless the device screen is unlocked.

     *

     * @see Builder#setUnlockedDeviceRequired(boolean)

     */
@@ -1288,7 +1288,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu 
        }



        /**

         * @hide Sets whether the keystore requires the screen to be unlocked before allowing decryption

         * 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 using this key

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

         * fingerprint, or other trusted factor to access.

keystore/java/android/security/keystore/KeyProtection.java

+2 −2
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs { 
    }



    /**

     * @hide Returns {@code true} if the key cannot be used unless the device screen is unlocked.

     * Returns {@code true} if the key cannot be used unless the device screen is unlocked.

     *

     * @see Builder#setUnlockedDeviceRequired(boolean)

     */
@@ -928,7 +928,7 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs { 
        }



        /**

         * @hide Sets whether the keystore requires the screen to be unlocked before allowing decryption

         * 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 using this key

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

         * fingerprint, or other trusted factor to access.