Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62fa81f7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move the trusted root CA certs for RecoverableKeyStore to our own folder" into pi-dev

parents e51af374 c5c4a0e9

core/java/android/security/backup/TrustedRootCertificates.java→core/java/android/security/keystore/recovery/TrustedRootCertificates.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

core/java/android/security/backup/X509CertificateParsingUtils.java→core/java/android/security/keystore/recovery/X509CertificateParsingUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/tests/coretests/src/android/security/backup/TrustedRootCertificatesTest.java→core/tests/coretests/src/android/security/keystore/recovery/TrustedRootCertificatesTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

core/tests/coretests/src/android/security/backup/X509CertificateParsingUtilsTest.java→core/tests/coretests/src/android/security/keystore/recovery/X509CertificateParsingUtilsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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;