diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-01-24 16:17:43 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-01-24 18:17:21 -0800 |
| commit | 4140faeebbfa23d56068c1862b2913fb62145f4f (patch) | |
| tree | 35b073fcf402b3b06a1d0eb74a23eaf3c7fc93e6 /core/java/android/webkit | |
| parent | 9c91b3f9d679a22560141e6388e125879fb9f96a (diff) | |
| download | frameworks_base-4140faeebbfa23d56068c1862b2913fb62145f4f.zip frameworks_base-4140faeebbfa23d56068c1862b2913fb62145f4f.tar.gz frameworks_base-4140faeebbfa23d56068c1862b2913fb62145f4f.tar.bz2 | |
Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle
Bug: 3086427
Change-Id: I7af99fe4c36d9a519777f0499ccab65646313879
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/CacheManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/webkit/CertTool.java | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/webkit/CacheManager.java b/core/java/android/webkit/CacheManager.java index a553a45..e440eb9 100644 --- a/core/java/android/webkit/CacheManager.java +++ b/core/java/android/webkit/CacheManager.java @@ -33,8 +33,8 @@ import java.util.List; import java.util.Map; -import org.bouncycastle.crypto.Digest; -import org.bouncycastle.crypto.digests.SHA1Digest; +import com.android.org.bouncycastle.crypto.Digest; +import com.android.org.bouncycastle.crypto.digests.SHA1Digest; /** * The class CacheManager provides the persistent cache of content that is diff --git a/core/java/android/webkit/CertTool.java b/core/java/android/webkit/CertTool.java index 99757d2..d25d970 100644 --- a/core/java/android/webkit/CertTool.java +++ b/core/java/android/webkit/CertTool.java @@ -16,10 +16,10 @@ package android.webkit; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.jce.netscape.NetscapeCertRequest; -import org.bouncycastle.util.encoders.Base64; +import com.android.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; +import com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier; +import com.android.org.bouncycastle.jce.netscape.NetscapeCertRequest; +import com.android.org.bouncycastle.util.encoders.Base64; import android.content.ActivityNotFoundException; import android.content.Context; |