Merge "CertInstaller: use unbundled version of BouncyCastle. BouncyCastle APIs cannot be exposed in updatable ART." am: 294b61b1ab

Original change: https://android-review.googlesource.com/c/platform/packages/apps/CertInstaller/+/1559655

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id529f4d76a532a50cb9054942742ac056094e6ce

2 files changed, 7 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index a6ded0b..aeebb6b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,8 @@
 android_app {
     name: "CertInstaller",
+    static_libs: [
+        "bouncycastle-unbundled",
+    ],
     srcs: ["src/**/*.java"],
     platform_apis: true,
     certificate: "platform",
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;