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

Merge "Unhide RecoveryController#getRootCertificates()" into pi-dev

Browse Source
This commit is contained in:
Robert Berry
2018-03-22 17:23:05 +00:00
committed by Android (Google) Code Review
parent 3818de595b 93d002ca5f
commit c6bd185565
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -4371,6 +4371,7 @@ package android.security.keystore.recovery {
method public int[] getRecoverySecretTypes() throws android.security.keystore.recovery.InternalRecoveryServiceException;
method public deprecated int getRecoveryStatus(java.lang.String, java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;
method public int getRecoveryStatus(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;
method public java.util.Map<java.lang.String, java.security.cert.X509Certificate> getRootCertificates();
method public java.security.Key importKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;
method public deprecated void initRecoveryService(java.lang.String, byte[]) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;
method public void initRecoveryService(java.lang.String, byte[], byte[]) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;

6
core/java/android/security/keystore/recovery/RecoveryController.java
View File

@@ -35,6 +35,7 @@ import java.security.Key;
import java.security.UnrecoverableKeyException;
import java.security.cert.CertPath;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -654,6 +655,11 @@ public class RecoveryController {
return RecoverySession.newInstance(this);
}
@RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
public Map<String, X509Certificate> getRootCertificates() {
return TrustedRootCertificates.getRootCertificates();
}
InternalRecoveryServiceException wrapUnexpectedServiceSpecificException(
ServiceSpecificException e) {
if (e.errorCode == ERROR_SERVICE_INTERNAL_ERROR) {

7
core/java/android/security/keystore/recovery/TrustedRootCertificates.java
View File

@@ -32,7 +32,7 @@ import java.util.Map;
*
* @hide
*/
public class TrustedRootCertificates {
public final class TrustedRootCertificates {
public static final String GOOGLE_CLOUD_KEY_VAULT_SERVICE_V1_ALIAS =
"GoogleCloudKeyVaultServiceV1";
@@ -83,7 +83,7 @@ public class TrustedRootCertificates {
/**
* Returns all available root certificates, keyed by alias.
*/
public static Map<String, X509Certificate> listRootCertificates() {
public static Map<String, X509Certificate> getRootCertificates() {
return new ArrayMap(ALL_ROOT_CERTIFICATES);
}
@@ -114,4 +114,7 @@ public class TrustedRootCertificates {
throw new RuntimeException(e);
}
}
// Statics only
private TrustedRootCertificates() {}
}

6
core/tests/coretests/src/android/security/keystore/recovery/TrustedRootCertificatesTest.java
View File

@@ -16,7 +16,7 @@
package android.security.keystore.recovery;
import static android.security.keystore.recovery.TrustedRootCertificates.listRootCertificates;
import static android.security.keystore.recovery.TrustedRootCertificates.getRootCertificates;
import static org.junit.Assert.assertTrue;
@@ -36,8 +36,8 @@ public class TrustedRootCertificatesTest {
"GoogleCloudKeyVaultServiceV1";
@Test
public void listRootCertificates_listsGoogleCloudVaultV1Certificate() {
Map<String, X509Certificate> certificates = listRootCertificates();
public void getRootCertificates_listsGoogleCloudVaultV1Certificate() {
Map<String, X509Certificate> certificates = getRootCertificates();
assertTrue(certificates.containsKey(GOOGLE_CLOUD_KEY_VAULT_SERVICE_V1_ALIAS));
}