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

Commit 7d64fc41 authored by Shawn Willden's avatar Shawn Willden Committed by android-build-merger
Browse files

Merge "Rename trustedUserPresenceRequired." into pi-dev 

am: 840c29eb

Change-Id: I197f09918da53af24dbdf73f514ede750129d4f6
parents e88e5584 840c29eb

api/current.txt

+4 −4
Original line number Original line Diff line number Diff line
@@ -38580,11 +38580,11 @@ package android.security.keystore { 
    method public boolean isInvalidatedByBiometricEnrollment();

    method public boolean isInvalidatedByBiometricEnrollment();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isStrongBoxBacked();

    method public boolean isStrongBoxBacked();

    method public boolean isTrustedUserPresenceRequired();

    method public boolean isUnlockedDeviceRequired();

    method public boolean isUnlockedDeviceRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationValidWhileOnBody();

    method public boolean isUserAuthenticationValidWhileOnBody();

    method public boolean isUserConfirmationRequired();

    method public boolean isUserConfirmationRequired();

    method public boolean isUserPresenceRequired();

  }

  }

















  public static final class KeyGenParameterSpec.Builder {







  public static final class KeyGenParameterSpec.Builder {









@@ -38608,12 +38608,12 @@ package android.security.keystore {









    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityStart(java.util.Date);







    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityStart(java.util.Date);











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







    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 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 setUnlockedDeviceRequired(boolean);











    method public android.security.keystore.KeyGenParameterSpec.Builder setUserAuthenticationRequired(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 setUserAuthenticationValidWhileOnBody(boolean);











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







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











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







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














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











  }







  }



























  public class KeyInfo implements java.security.spec.KeySpec {







  public class KeyInfo implements java.security.spec.KeySpec {










@@ -38701,11 +38701,11 @@ package android.security.keystore {









    method public boolean isDigestsSpecified();







    method public boolean isDigestsSpecified();











    method public boolean isInvalidatedByBiometricEnrollment();







    method public boolean isInvalidatedByBiometricEnrollment();











    method public boolean isRandomizedEncryptionRequired();







    method public boolean isRandomizedEncryptionRequired();











    method public boolean isTrustedUserPresenceRequired();














    method public boolean isUnlockedDeviceRequired();







    method public boolean isUnlockedDeviceRequired();











    method public boolean isUserAuthenticationRequired();







    method public boolean isUserAuthenticationRequired();











    method public boolean isUserAuthenticationValidWhileOnBody();







    method public boolean isUserAuthenticationValidWhileOnBody();











    method public boolean isUserConfirmationRequired();







    method public boolean isUserConfirmationRequired();














    method public boolean isUserPresenceRequired();











  }







  }



























  public static final class KeyProtection.Builder {







  public static final class KeyProtection.Builder {









@@ -38721,12 +38721,12 @@ package android.security.keystore {









    method public android.security.keystore.KeyProtection.Builder setKeyValidityStart(java.util.Date);







    method public android.security.keystore.KeyProtection.Builder setKeyValidityStart(java.util.Date);











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







    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 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 setUnlockedDeviceRequired(boolean);











    method public android.security.keystore.KeyProtection.Builder setUserAuthenticationRequired(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 setUserAuthenticationValidWhileOnBody(boolean);











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







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











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







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














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











  }







  }



























  public class SecureKeyImportUnavailableException extends java.security.ProviderException {







  public class SecureKeyImportUnavailableException extends java.security.ProviderException {

























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



+10
−10




























Original line number
Original line
Diff line number
Diff line








@@ -259,7 +259,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu









    private final boolean mRandomizedEncryptionRequired;







    private final boolean mRandomizedEncryptionRequired;











    private final boolean mUserAuthenticationRequired;







    private final boolean mUserAuthenticationRequired;











    private final int mUserAuthenticationValidityDurationSeconds;







    private final int mUserAuthenticationValidityDurationSeconds;











    private final boolean mTrustedUserPresenceRequred;







    private final boolean mUserPresenceRequired;











    private final byte[] mAttestationChallenge;







    private final byte[] mAttestationChallenge;











    private final boolean mUniqueIdIncluded;







    private final boolean mUniqueIdIncluded;











    private final boolean mUserAuthenticationValidWhileOnBody;







    private final boolean mUserAuthenticationValidWhileOnBody;










@@ -291,7 +291,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu









            boolean randomizedEncryptionRequired,







            boolean randomizedEncryptionRequired,











            boolean userAuthenticationRequired,







            boolean userAuthenticationRequired,











            int userAuthenticationValidityDurationSeconds,







            int userAuthenticationValidityDurationSeconds,











            boolean trustedUserPresenceRequired,







            boolean userPresenceRequired,











            byte[] attestationChallenge,







            byte[] attestationChallenge,











            boolean uniqueIdIncluded,







            boolean uniqueIdIncluded,











            boolean userAuthenticationValidWhileOnBody,







            boolean userAuthenticationValidWhileOnBody,










@@ -339,7 +339,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu









        mBlockModes = ArrayUtils.cloneIfNotEmpty(ArrayUtils.nullToEmpty(blockModes));







        mBlockModes = ArrayUtils.cloneIfNotEmpty(ArrayUtils.nullToEmpty(blockModes));











        mRandomizedEncryptionRequired = randomizedEncryptionRequired;







        mRandomizedEncryptionRequired = randomizedEncryptionRequired;











        mUserAuthenticationRequired = userAuthenticationRequired;







        mUserAuthenticationRequired = userAuthenticationRequired;











        mTrustedUserPresenceRequred = trustedUserPresenceRequired;







        mUserPresenceRequired = userPresenceRequired;











        mUserAuthenticationValidityDurationSeconds = userAuthenticationValidityDurationSeconds;







        mUserAuthenticationValidityDurationSeconds = userAuthenticationValidityDurationSeconds;











        mAttestationChallenge = Utils.cloneIfNotNull(attestationChallenge);







        mAttestationChallenge = Utils.cloneIfNotNull(attestationChallenge);











        mUniqueIdIncluded = uniqueIdIncluded;







        mUniqueIdIncluded = uniqueIdIncluded;










@@ -595,8 +595,8 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu









     * Returns {@code true} if the key is authorized to be used only if a test of user presence has







     * Returns {@code true} if the key is authorized to be used only if a test of user presence has











     * been performed between the {@code Signature.initSign()} and {@code Signature.sign()} calls.







     * been performed between the {@code Signature.initSign()} and {@code Signature.sign()} calls.











     */







     */











    public boolean isTrustedUserPresenceRequired() {







    public boolean isUserPresenceRequired() {











        return mTrustedUserPresenceRequred;







        return mUserPresenceRequired;











    }







    }































    /**







    /**










@@ -712,7 +712,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu









        private boolean mRandomizedEncryptionRequired = true;







        private boolean mRandomizedEncryptionRequired = true;











        private boolean mUserAuthenticationRequired;







        private boolean mUserAuthenticationRequired;











        private int mUserAuthenticationValidityDurationSeconds = -1;







        private int mUserAuthenticationValidityDurationSeconds = -1;











        private boolean mTrustedUserPresenceRequired = false;







        private boolean mUserPresenceRequired = false;











        private byte[] mAttestationChallenge = null;







        private byte[] mAttestationChallenge = null;











        private boolean mUniqueIdIncluded = false;







        private boolean mUniqueIdIncluded = false;











        private boolean mUserAuthenticationValidWhileOnBody;







        private boolean mUserAuthenticationValidWhileOnBody;










@@ -775,7 +775,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu









            mUserAuthenticationRequired = sourceSpec.isUserAuthenticationRequired();







            mUserAuthenticationRequired = sourceSpec.isUserAuthenticationRequired();











            mUserAuthenticationValidityDurationSeconds =







            mUserAuthenticationValidityDurationSeconds =











                sourceSpec.getUserAuthenticationValidityDurationSeconds();







                sourceSpec.getUserAuthenticationValidityDurationSeconds();











            mTrustedUserPresenceRequired = sourceSpec.isTrustedUserPresenceRequired();







            mUserPresenceRequired = sourceSpec.isUserPresenceRequired();











            mAttestationChallenge = sourceSpec.getAttestationChallenge();







            mAttestationChallenge = sourceSpec.getAttestationChallenge();











            mUniqueIdIncluded = sourceSpec.isUniqueIdIncluded();







            mUniqueIdIncluded = sourceSpec.isUniqueIdIncluded();











            mUserAuthenticationValidWhileOnBody = sourceSpec.isUserAuthenticationValidWhileOnBody();







            mUserAuthenticationValidWhileOnBody = sourceSpec.isUserAuthenticationValidWhileOnBody();










@@ -1180,8 +1180,8 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu









         * {@code Signature.initSign()} and {@code Signature.sign()} method calls.







         * {@code Signature.initSign()} and {@code Signature.sign()} method calls.











         */







         */











        @NonNull







        @NonNull











        public Builder setTrustedUserPresenceRequired(boolean required) {







        public Builder setUserPresenceRequired(boolean required) {











            mTrustedUserPresenceRequired = required;







            mUserPresenceRequired = required;











            return this;







            return this;











        }







        }






























@@ -1324,7 +1324,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu









                    mRandomizedEncryptionRequired,







                    mRandomizedEncryptionRequired,











                    mUserAuthenticationRequired,







                    mUserAuthenticationRequired,











                    mUserAuthenticationValidityDurationSeconds,







                    mUserAuthenticationValidityDurationSeconds,











                    mTrustedUserPresenceRequired,







                    mUserPresenceRequired,











                    mAttestationChallenge,







                    mAttestationChallenge,











                    mUniqueIdIncluded,







                    mUniqueIdIncluded,











                    mUserAuthenticationValidWhileOnBody,







                    mUserAuthenticationValidWhileOnBody,

































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



+9
−9




























Original line number
Original line
Diff line number
Diff line








@@ -224,7 +224,7 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs {









    private final boolean mRandomizedEncryptionRequired;







    private final boolean mRandomizedEncryptionRequired;











    private final boolean mUserAuthenticationRequired;







    private final boolean mUserAuthenticationRequired;











    private final int mUserAuthenticationValidityDurationSeconds;







    private final int mUserAuthenticationValidityDurationSeconds;











    private final boolean mTrustedUserPresenceRequired;







    private final boolean mUserPresenceRequred;











    private final boolean mUserAuthenticationValidWhileOnBody;







    private final boolean mUserAuthenticationValidWhileOnBody;











    private final boolean mInvalidatedByBiometricEnrollment;







    private final boolean mInvalidatedByBiometricEnrollment;











    private final long mBoundToSecureUserId;







    private final long mBoundToSecureUserId;









@@ -244,7 +244,7 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs {









            boolean randomizedEncryptionRequired,







            boolean randomizedEncryptionRequired,











            boolean userAuthenticationRequired,







            boolean userAuthenticationRequired,











            int userAuthenticationValidityDurationSeconds,







            int userAuthenticationValidityDurationSeconds,











            boolean trustedUserPresenceRequired,







            boolean userPresenceRequred,











            boolean userAuthenticationValidWhileOnBody,







            boolean userAuthenticationValidWhileOnBody,











            boolean invalidatedByBiometricEnrollment,







            boolean invalidatedByBiometricEnrollment,











            long boundToSecureUserId,







            long boundToSecureUserId,









@@ -264,7 +264,7 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs {









        mRandomizedEncryptionRequired = randomizedEncryptionRequired;







        mRandomizedEncryptionRequired = randomizedEncryptionRequired;











        mUserAuthenticationRequired = userAuthenticationRequired;







        mUserAuthenticationRequired = userAuthenticationRequired;











        mUserAuthenticationValidityDurationSeconds = userAuthenticationValidityDurationSeconds;







        mUserAuthenticationValidityDurationSeconds = userAuthenticationValidityDurationSeconds;











        mTrustedUserPresenceRequired = trustedUserPresenceRequired;







        mUserPresenceRequred = userPresenceRequred;











        mUserAuthenticationValidWhileOnBody = userAuthenticationValidWhileOnBody;







        mUserAuthenticationValidWhileOnBody = userAuthenticationValidWhileOnBody;











        mInvalidatedByBiometricEnrollment = invalidatedByBiometricEnrollment;







        mInvalidatedByBiometricEnrollment = invalidatedByBiometricEnrollment;











        mBoundToSecureUserId = boundToSecureUserId;







        mBoundToSecureUserId = boundToSecureUserId;










@@ -446,8 +446,8 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs {









     * Returns {@code true} if the key is authorized to be used only if a test of user presence has







     * Returns {@code true} if the key is authorized to be used only if a test of user presence has











     * been performed between the {@code Signature.initSign()} and {@code Signature.sign()} calls.







     * been performed between the {@code Signature.initSign()} and {@code Signature.sign()} calls.











     */







     */











    public boolean isTrustedUserPresenceRequired() {







    public boolean isUserPresenceRequired() {











        return mTrustedUserPresenceRequired;







        return mUserPresenceRequred;











    }







    }































    /**







    /**










@@ -532,7 +532,7 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs {









        private boolean mRandomizedEncryptionRequired = true;







        private boolean mRandomizedEncryptionRequired = true;











        private boolean mUserAuthenticationRequired;







        private boolean mUserAuthenticationRequired;











        private int mUserAuthenticationValidityDurationSeconds = -1;







        private int mUserAuthenticationValidityDurationSeconds = -1;











        private boolean mTrustedUserPresenceRequired = false;







        private boolean mUserPresenceRequired = false;











        private boolean mUserAuthenticationValidWhileOnBody;







        private boolean mUserAuthenticationValidWhileOnBody;











        private boolean mInvalidatedByBiometricEnrollment = true;







        private boolean mInvalidatedByBiometricEnrollment = true;











        private boolean mUserConfirmationRequired;







        private boolean mUserConfirmationRequired;










@@ -841,8 +841,8 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs {









         * {@code Signature.initSign()} and {@code Signature.sign()} method calls.







         * {@code Signature.initSign()} and {@code Signature.sign()} method calls.











         */







         */











        @NonNull







        @NonNull











        public Builder setTrustedUserPresenceRequired(boolean required) {







        public Builder setUserPresenceRequired(boolean required) {











            mTrustedUserPresenceRequired = required;







            mUserPresenceRequired = required;











            return this;







            return this;











        }







        }






























@@ -958,7 +958,7 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs {









                    mRandomizedEncryptionRequired,







                    mRandomizedEncryptionRequired,











                    mUserAuthenticationRequired,







                    mUserAuthenticationRequired,











                    mUserAuthenticationValidityDurationSeconds,







                    mUserAuthenticationValidityDurationSeconds,











                    mTrustedUserPresenceRequired,







                    mUserPresenceRequired,











                    mUserAuthenticationValidWhileOnBody,







                    mUserAuthenticationValidWhileOnBody,











                    mInvalidatedByBiometricEnrollment,







                    mInvalidatedByBiometricEnrollment,











                    mBoundToSecureUserId,







                    mBoundToSecureUserId,

































keystore/java/android/security/keystore/KeymasterUtils.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -106,7 +106,7 @@ public abstract class KeymasterUtils {









            args.addBoolean(KeymasterDefs.KM_TAG_TRUSTED_CONFIRMATION_REQUIRED);







            args.addBoolean(KeymasterDefs.KM_TAG_TRUSTED_CONFIRMATION_REQUIRED);











        }







        }































        if (spec.isTrustedUserPresenceRequired()) {







        if (spec.isUserPresenceRequired()) {











            args.addBoolean(KeymasterDefs.KM_TAG_TRUSTED_USER_PRESENCE_REQUIRED);







            args.addBoolean(KeymasterDefs.KM_TAG_TRUSTED_USER_PRESENCE_REQUIRED);











        }







        }





















































keystore/java/android/security/keystore/ParcelableKeyGenParameterSpec.java



+2
−2




























Original line number
Original line
Diff line number
Diff line








@@ -101,7 +101,7 @@ public final class ParcelableKeyGenParameterSpec implements Parcelable {









        out.writeBoolean(mSpec.isUniqueIdIncluded());







        out.writeBoolean(mSpec.isUniqueIdIncluded());











        out.writeBoolean(mSpec.isUserAuthenticationValidWhileOnBody());







        out.writeBoolean(mSpec.isUserAuthenticationValidWhileOnBody());











        out.writeBoolean(mSpec.isInvalidatedByBiometricEnrollment());







        out.writeBoolean(mSpec.isInvalidatedByBiometricEnrollment());











        out.writeBoolean(mSpec.isTrustedUserPresenceRequired());







        out.writeBoolean(mSpec.isUserPresenceRequired());











    }







    }































    private static Date readDateOrNull(Parcel in) {







    private static Date readDateOrNull(Parcel in) {










@@ -165,7 +165,7 @@ public final class ParcelableKeyGenParameterSpec implements Parcelable {









        builder.setUniqueIdIncluded(in.readBoolean());







        builder.setUniqueIdIncluded(in.readBoolean());











        builder.setUserAuthenticationValidWhileOnBody(in.readBoolean());







        builder.setUserAuthenticationValidWhileOnBody(in.readBoolean());











        builder.setInvalidatedByBiometricEnrollment(in.readBoolean());







        builder.setInvalidatedByBiometricEnrollment(in.readBoolean());











        builder.setTrustedUserPresenceRequired(in.readBoolean());







        builder.setUserPresenceRequired(in.readBoolean());











        mSpec = builder.build();







        mSpec = builder.build();











    }







    }