From c5c4a0e9481cdb7e40eddf31d53becb9ea82aca6 Mon Sep 17 00:00:00 2001 From: Bo Zhu Date: Tue, 20 Mar 2018 14:27:07 -0700 Subject: [PATCH] Move the trusted root CA certs for RecoverableKeyStore to our own folder Bug: 74621071 Test: runtest frameworks-core -p android.security.keystore.recovery Change-Id: I3668594b29f56832f2a1fe78b01f585c897bf952 --- .../recovery}/TrustedRootCertificates.java | 4 ++-- .../recovery}/X509CertificateParsingUtils.java | 2 +- .../recovery}/TrustedRootCertificatesTest.java | 4 ++-- .../recovery}/X509CertificateParsingUtilsTest.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename core/java/android/security/{backup => keystore/recovery}/TrustedRootCertificates.java (97%) rename core/java/android/security/{backup => keystore/recovery}/X509CertificateParsingUtils.java (98%) rename core/tests/coretests/src/android/security/{backup => keystore/recovery}/TrustedRootCertificatesTest.java (90%) rename core/tests/coretests/src/android/security/{backup => keystore/recovery}/X509CertificateParsingUtilsTest.java (96%) diff --git a/core/java/android/security/backup/TrustedRootCertificates.java b/core/java/android/security/keystore/recovery/TrustedRootCertificates.java similarity index 97% rename from core/java/android/security/backup/TrustedRootCertificates.java rename to core/java/android/security/keystore/recovery/TrustedRootCertificates.java index ed922eda4d102..27c652278512a 100644 --- a/core/java/android/security/backup/TrustedRootCertificates.java +++ b/core/java/android/security/keystore/recovery/TrustedRootCertificates.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package android.security.backup; +package android.security.keystore.recovery; -import static android.security.backup.X509CertificateParsingUtils.decodeBase64Cert; +import static android.security.keystore.recovery.X509CertificateParsingUtils.decodeBase64Cert; import android.util.ArrayMap; diff --git a/core/java/android/security/backup/X509CertificateParsingUtils.java b/core/java/android/security/keystore/recovery/X509CertificateParsingUtils.java similarity index 98% rename from core/java/android/security/backup/X509CertificateParsingUtils.java rename to core/java/android/security/keystore/recovery/X509CertificateParsingUtils.java index 30495decd917d..fa72c836b5dfe 100644 --- a/core/java/android/security/backup/X509CertificateParsingUtils.java +++ b/core/java/android/security/keystore/recovery/X509CertificateParsingUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.security.backup; +package android.security.keystore.recovery; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/core/tests/coretests/src/android/security/backup/TrustedRootCertificatesTest.java b/core/tests/coretests/src/android/security/keystore/recovery/TrustedRootCertificatesTest.java similarity index 90% rename from core/tests/coretests/src/android/security/backup/TrustedRootCertificatesTest.java rename to core/tests/coretests/src/android/security/keystore/recovery/TrustedRootCertificatesTest.java index 0f9cb45b88996..3b4ad38011358 100644 --- a/core/tests/coretests/src/android/security/backup/TrustedRootCertificatesTest.java +++ b/core/tests/coretests/src/android/security/keystore/recovery/TrustedRootCertificatesTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package android.security.backup; +package android.security.keystore.recovery; -import static android.security.backup.TrustedRootCertificates.listRootCertificates; +import static android.security.keystore.recovery.TrustedRootCertificates.listRootCertificates; import static org.junit.Assert.assertTrue; diff --git a/core/tests/coretests/src/android/security/backup/X509CertificateParsingUtilsTest.java b/core/tests/coretests/src/android/security/keystore/recovery/X509CertificateParsingUtilsTest.java similarity index 96% rename from core/tests/coretests/src/android/security/backup/X509CertificateParsingUtilsTest.java rename to core/tests/coretests/src/android/security/keystore/recovery/X509CertificateParsingUtilsTest.java index ad85c2518325a..7f0eb43f23beb 100644 --- a/core/tests/coretests/src/android/security/backup/X509CertificateParsingUtilsTest.java +++ b/core/tests/coretests/src/android/security/keystore/recovery/X509CertificateParsingUtilsTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package android.security.backup; +package android.security.keystore.recovery; -import static android.security.backup.X509CertificateParsingUtils.decodeBase64Cert; +import static android.security.keystore.recovery.X509CertificateParsingUtils.decodeBase64Cert; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail;