diff options
author | Bartosz Fabianowski <bartfab@google.com> | 2017-02-22 23:41:14 +0100 |
---|---|---|
committer | Bartosz Fabianowski <bartfab@google.com> | 2017-03-03 19:42:51 +0100 |
commit | 05dc9f764c9d399add8b7495e680f66d098c55eb (patch) | |
tree | 9ef2b8247c040c633438baffc7dd38e9f819339d /keystore/java/android/security/IKeyChainService.aidl | |
parent | f063264d3a1393608501f9c07180a1f3cfbb8b7f (diff) |
Add API for checking which CA certs were installed by the DO/PO
With this API, the system can determine whether a CA cert was
installed by the user or the user's DO/PO.
Bug: 32692748
Test: unit tests (see DevicePolicyManagerTest.java for invocation)
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases
Change-Id: I3bcae5ac18ec2b110154184fc515df804fd73da6
Diffstat (limited to 'keystore/java/android/security/IKeyChainService.aidl')
-rw-r--r-- | keystore/java/android/security/IKeyChainService.aidl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore/java/android/security/IKeyChainService.aidl b/keystore/java/android/security/IKeyChainService.aidl index b68543146a51..c4bb72c71d17 100644 --- a/keystore/java/android/security/IKeyChainService.aidl +++ b/keystore/java/android/security/IKeyChainService.aidl @@ -29,8 +29,8 @@ interface IKeyChainService { byte[] getCertificate(String alias); byte[] getCaCertificates(String alias); - // APIs used by CertInstaller - void installCaCertificate(in byte[] caCertificate); + // APIs used by CertInstaller and DevicePolicyManager + String installCaCertificate(in byte[] caCertificate); // APIs used by DevicePolicyManager boolean installKeyPair(in byte[] privateKey, in byte[] userCert, in byte[] certChain, String alias); |