Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 62fa81f7b4

Change-Id: Ib9e6eea3f787c56e8be34f922c78a326d808a481
This commit is contained in:
Bo Zhu
2018-03-21 04:24:23 +00:00
committed by android-build-merger
parent 18e16c1180 62fa81f7b4
commit 71802f34c2
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/security/backup/TrustedRootCertificates.java → core/java/android/security/keystore/recovery/TrustedRootCertificates.java
View File

@@ -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;

2
core/java/android/security/backup/X509CertificateParsingUtils.java → core/java/android/security/keystore/recovery/X509CertificateParsingUtils.java
View File

@@ -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;

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

@@ -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;

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

@@ -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;