Merge "Merge "Fix IllegalArgumentException in KeyChain" am: 932f96b27f am:... (a4ed13b3) · Commits · e / os / android_frameworks_base

keystore/java/android/security/KeyStore.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ import java.io.ByteArrayInputStream;
		import java.io.IOException;
		import java.security.InvalidKeyException;
		import java.util.Arrays;
		import java.util.Date;
		import java.util.List;
		import java.util.Locale;
		import java.util.concurrent.CompletableFuture;
		@@ -700,11 +701,9 @@ public class KeyStore {
		args.addEnum(KeymasterDefs.KM_TAG_DIGEST, KeymasterDefs.KM_DIGEST_SHA_2_384);
		args.addEnum(KeymasterDefs.KM_TAG_DIGEST, KeymasterDefs.KM_DIGEST_SHA_2_512);
		args.addBoolean(KeymasterDefs.KM_TAG_NO_AUTH_REQUIRED);
		args.addUnsignedLong(KeymasterDefs.KM_TAG_ORIGINATION_EXPIRE_DATETIME,
		KeymasterArguments.UINT64_MAX_VALUE);
		args.addUnsignedLong(KeymasterDefs.KM_TAG_USAGE_EXPIRE_DATETIME,
		KeymasterArguments.UINT64_MAX_VALUE);
		args.addUnsignedLong(KeymasterDefs.KM_TAG_ACTIVE_DATETIME, BigInteger.ZERO);
		args.addDate(KeymasterDefs.KM_TAG_ORIGINATION_EXPIRE_DATETIME, new Date(Long.MAX_VALUE));
		args.addDate(KeymasterDefs.KM_TAG_USAGE_EXPIRE_DATETIME, new Date(Long.MAX_VALUE));
		args.addDate(KeymasterDefs.KM_TAG_ACTIVE_DATETIME, new Date(0));
		return args;
		}