diff options
| author | Daulet Zhanguzin <dauletz@google.com> | 2021-01-25 20:20:51 +0000 |
|---|---|---|
| committer | Daulet Zhanguzin <dauletz@google.com> | 2021-01-27 13:15:54 +0000 |
| commit | c9e9ac7154eeccdba56301fe9300554b2d3e2d98 (patch) | |
| tree | d2191ebb6872fc6eacb781bf8d1c7f042009be5e /src | |
| parent | b5721d5b8277793863cbc6d53aecc54821442f1b (diff) | |
| download | platform_packages_apps_CertInstaller-c9e9ac7154eeccdba56301fe9300554b2d3e2d98.tar.gz platform_packages_apps_CertInstaller-c9e9ac7154eeccdba56301fe9300554b2d3e2d98.tar.bz2 platform_packages_apps_CertInstaller-c9e9ac7154eeccdba56301fe9300554b2d3e2d98.zip | |
CertInstaller: use unbundled version of BouncyCastle. BouncyCastle APIs cannot be exposed in updatable ART.
Bug: 154796679
Test: Treehugger
Test: atest CertInstallerRoboTests
Change-Id: I81b43f7dd7b04d20a434ea80867b09c2cecf1eca
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/certinstaller/CredentialHelper.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/certinstaller/CredentialHelper.java b/src/com/android/certinstaller/CredentialHelper.java index 45791e9..eab58f5 100644 --- a/src/com/android/certinstaller/CredentialHelper.java +++ b/src/com/android/certinstaller/CredentialHelper.java @@ -36,11 +36,11 @@ import android.text.TextUtils; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; -import com.android.org.bouncycastle.asn1.ASN1InputStream; -import com.android.org.bouncycastle.asn1.ASN1Sequence; -import com.android.org.bouncycastle.asn1.DEROctetString; -import com.android.org.bouncycastle.asn1.x509.BasicConstraints; import com.android.org.conscrypt.TrustedCertificateStore; +import org.bouncycastle.asn1.ASN1InputStream; +import org.bouncycastle.asn1.ASN1Sequence; +import org.bouncycastle.asn1.DEROctetString; +import org.bouncycastle.asn1.x509.BasicConstraints; import java.io.ByteArrayInputStream; import java.io.IOException; |