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

Commit be10891c authored Mar 29, 2018 by Allen Webb

keystore: Change superclass of UserPresenceUnavailableException.



Also add additional comments to isTrustedUserPresenceRequired().

Test: m -j KeystoreTests && adb install -r
out/target/product/${TARGET_PRODUCT}/data/app/KeystoreTests/KeystoreTests.apk
    adb shell am instrument

Bug: 73392697
Bug: 76462141
Change-Id: Iabcc331adda53e2a5cad5ead6002dfbc29188da2
Signed-off-by: Allen Webb <allenwebb@google.com>

parent 912853be

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -38717,7 +38717,7 @@ package android.security.keystore {
		ctor public UserNotAuthenticatedException(java.lang.String, java.lang.Throwable);
		}

		public class UserPresenceUnavailableException extends java.security.InvalidAlgorithmParameterException {
		public class UserPresenceUnavailableException extends java.security.InvalidKeyException {
		ctor public UserPresenceUnavailableException();
		ctor public UserPresenceUnavailableException(java.lang.String);
		ctor public UserPresenceUnavailableException(java.lang.String, java.lang.Throwable);

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -445,6 +445,9 @@ 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
		* been performed between the {@code Signature.initSign()} and {@code Signature.sign()} calls.
		* It requires that the KeyStore implementation have a direct way to validate the user presence
		* for example a KeyStore hardware backed strongbox can use a button press that is observable
		* in hardware.
		*/
		public boolean isTrustedUserPresenceRequired() {
		return mTrustedUserPresenceRequired;

keystore/java/android/security/keystore/UserPresenceUnavailableException.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,13 +16,13 @@

		package android.security.keystore;

		import java.security.InvalidAlgorithmParameterException;
		import java.security.InvalidKeyException;

		/**
		* Indicates the condition that a proof of user-presence was
		* requested but this proof was not presented.
		*/
		public class UserPresenceUnavailableException extends InvalidAlgorithmParameterException {
		public class UserPresenceUnavailableException extends InvalidKeyException {
		/**
		* Constructs a {@code UserPresenceUnavailableException} without a detail message or cause.
		*/