summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Zeuthen <zeuthen@google.com> 2020-01-21 18:05:12 -0800
committer android-build-merger <android-build-merger@google.com> 2020-01-21 18:05:12 -0800
commit1079db8fd33c361b33de0cb7282447d13e2816c2 (patch)
tree73f3466602c642d1060953aaf0e3e64e24f9d774
parentead7c0e489e26fbe6bd1a853869912a834b9d9d0 (diff)
parentcd3676cefd7190f2cd6e4ae4e87de1adf1add393 (diff)
Merge "Hide WriteableIdentityCredential constructor from public API"
am: cd3676cefd Change-Id: Ic2446260b51883e8899d8c4621d2c5dbff660c02
-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>