summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-01-22 02:17:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-01-22 02:17:22 +0000
commitb40a0cba63893b45de9707175653ee1c155eddb3 (patch)
treed8d551c51e5b2f88d3fd991e834f4de98ca1d9cf
parente5ad71ec99fe13e1e2a7564e86158238e3df8a13 (diff)
parent1079db8fd33c361b33de0cb7282447d13e2816c2 (diff)
Merge "Hide WriteableIdentityCredential constructor from public API" am: cd3676cefd am: 1079db8fd3
Change-Id: I6c31fa1bde6de564ba6641c50aba46ab6bbad4e3
-rw-r--r--api/current.txt1
-rw-r--r--identity/java/android/security/identity/WritableIdentityCredential.java5
2 files changed, 5 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 5d5d1661a596..41e53070348f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -41193,7 +41193,6 @@ package android.security.identity {
}
public abstract class WritableIdentityCredential {
- ctor public WritableIdentityCredential();
method @NonNull public abstract java.util.Collection<java.security.cert.X509Certificate> getCredentialKeyCertificateChain(@NonNull byte[]);
method @NonNull public abstract byte[] personalize(@NonNull android.security.identity.PersonalizationData);
}
diff --git a/identity/java/android/security/identity/WritableIdentityCredential.java b/identity/java/android/security/identity/WritableIdentityCredential.java
index 5f575b9d56f3..e2a389bfd4da 100644
--- a/identity/java/android/security/identity/WritableIdentityCredential.java
+++ b/identity/java/android/security/identity/WritableIdentityCredential.java
@@ -31,6 +31,11 @@ import java.util.Collection;
*/
public abstract class WritableIdentityCredential {
/**
+ * @hide
+ */
+ protected WritableIdentityCredential() {}
+
+ /**
* Generates and returns an X.509 certificate chain for the CredentialKey which identifies this
* credential to the issuing authority. The certificate contains an
* <a href="https://source.android.com/security/keystore/attestation">Android Keystore</a>