summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/security/keystore/recovery/TrustedRootCertificates.java (renamed from core/java/android/security/backup/TrustedRootCertificates.java)4
-rw-r--r--core/java/android/security/keystore/recovery/X509CertificateParsingUtils.java (renamed from core/java/android/security/backup/X509CertificateParsingUtils.java)2
-rw-r--r--core/tests/coretests/src/android/security/keystore/recovery/TrustedRootCertificatesTest.java (renamed from core/tests/coretests/src/android/security/backup/TrustedRootCertificatesTest.java)4
-rw-r--r--core/tests/coretests/src/android/security/keystore/recovery/X509CertificateParsingUtilsTest.java (renamed from core/tests/coretests/src/android/security/backup/X509CertificateParsingUtilsTest.java)4
4 files changed, 7 insertions, 7 deletions
diff --git a/core/java/android/security/backup/TrustedRootCertificates.java b/core/java/android/security/keystore/recovery/TrustedRootCertificates.java
index ed922eda4d10..27c652278512 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
index 30495decd917..fa72c836b5df 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
index 0f9cb45b8899..3b4ad3801135 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
index ad85c2518325..7f0eb43f23be 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;