summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robin Lee <rgl@google.com> 2016-03-02 19:54:04 +0000
committer Robin Lee <rgl@google.com> 2016-03-02 19:54:04 +0000
commit8f617d40ab28257914fc4dd5cf64dbba972ba855 (patch)
tree51ce0750a6f19a9b30c96d815cf44ce7c0ff2203
parent42d8b7d7abe4ecab049e020c3836dae97660dd4d (diff)
DevicePolicyManager#removeKeyPair- update contract
May also return true if the keypair didn't exist in the first place which is a small reduction in the amount of information leakage, but more importantly lets a caller be sure about keystore state at the end of their call. Bug: 27335182 Change-Id: I5e6d4c599b74f031e3f6d17cb7540898ffaf2571
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 74fe13ac1961..91394285e2c7 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -2753,7 +2753,7 @@ public class DevicePolicyManager {
* @param admin Which {@link DeviceAdminReceiver} this request is associated with, or
* {@code null} if calling from a delegated certificate installer.
* @param alias The private key alias under which the certificate is installed.
- * @return {@code true} if the keys were both removed, {@code false} otherwise.
+ * @return {@code true} if the certificate alias no longer exists, {@code false} otherwise.
*/
public boolean removeKeyPair(@Nullable ComponentName admin, @NonNull String alias) {
try {