Merge "AttestedKeyPair: Address API review comments" (254ebf61) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -40700,7 +40700,7 @@ package android.se.omapi {
		package android.security {

		public final class AttestedKeyPair {
		ctor public AttestedKeyPair(@Nullable java.security.KeyPair, @Nullable java.security.cert.Certificate[]);
		ctor public AttestedKeyPair(@Nullable java.security.KeyPair, @NonNull java.util.List<java.security.cert.Certificate>);
		method @NonNull public java.util.List<java.security.cert.Certificate> getAttestationRecord();
		method @Nullable public java.security.KeyPair getKeyPair();
		}

keystore/java/android/security/AttestedKeyPair.java

+17 −6

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import java.security.KeyPair;
		import java.security.cert.Certificate;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.List;

		/**
		@@ -36,7 +37,7 @@ import java.util.List;

		public final class AttestedKeyPair {
		private final KeyPair mKeyPair;
		private final Certificate[] mAttestationRecord;
		private final List<Certificate> mAttestationRecord;

		/**
		* Public constructor for creating a new instance (useful for testing).
		@@ -44,11 +45,24 @@ public final class AttestedKeyPair {
		* @param keyPair the key pair associated with the attestation record.
		* @param attestationRecord attestation record for the provided key pair.
		*/
		public AttestedKeyPair(@Nullable KeyPair keyPair, @Nullable Certificate[] attestationRecord) {
		public AttestedKeyPair(
		@Nullable KeyPair keyPair, @NonNull List<Certificate> attestationRecord) {
		mKeyPair = keyPair;
		mAttestationRecord = attestationRecord;
		}

		/**
		* @hide used by platform.
		*/
		public AttestedKeyPair(@Nullable KeyPair keyPair, @Nullable Certificate[] attestationRecord) {
		mKeyPair = keyPair;
		if (attestationRecord == null) {
		mAttestationRecord = new ArrayList();
		} else {
		mAttestationRecord = Arrays.asList(attestationRecord);
		}
		}

		/**
		* Returns the generated key pair associated with the attestation record
		* in this instance.
		@@ -73,9 +87,6 @@ public final class AttestedKeyPair {
		* Key Attestation</a> for the format of the attestation record inside the certificate.
		*/
		public @NonNull List<Certificate> getAttestationRecord() {
		if (mAttestationRecord == null) {
		return new ArrayList();
		}
		return Arrays.asList(mAttestationRecord);
		return Collections.unmodifiableList(mAttestationRecord);
		}
		}