summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRubin Xu <rubinxu@google.com>2021-01-10 15:22:25 +0000
committerRubin Xu <rubinxu@google.com>2021-02-02 22:00:05 +0000
commit835170e397bcc9165537cb30c8ac212e9bb2708f (patch)
tree162cf99d24d0e86db1cc49f4f6b30f88e85cbde3
parente980914d426d6d1edcefda0025f445b58884ff17 (diff)
Add DPM.hasKeyPair()
(trimmed down to only contain IKeyChainService.aidl change) The method returns true if a private key and a user certifiate are present in KeyChain under this alias. Bug: 179180345 Test: atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testKeyManagement Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testDelegatedCertInstallerDirectly Test: atest android.admin.cts.DevicePolicyManagerTest Change-Id: I15ca6190db1ef4dbf0caabe9d46008d92f758df5 Merged-In: I15ca6190db1ef4dbf0caabe9d46008d92f758df5
-rw-r--r--keystore/java/android/security/IKeyChainService.aidl1
1 files changed, 1 insertions, 0 deletions
diff --git a/keystore/java/android/security/IKeyChainService.aidl b/keystore/java/android/security/IKeyChainService.aidl
index 97da3cc6f80f..1ae6a631dbcb 100644
--- a/keystore/java/android/security/IKeyChainService.aidl
+++ b/keystore/java/android/security/IKeyChainService.aidl
@@ -46,6 +46,7 @@ interface IKeyChainService {
boolean installKeyPair(
in byte[] privateKey, in byte[] userCert, in byte[] certChain, String alias, int uid);
boolean removeKeyPair(String alias);
+ boolean containsKeyPair(String alias);
// APIs used by Settings
boolean deleteCaCertificate(String alias);