summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robin Lee <rgl@google.com> 2016-03-02 20:05:39 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-03-02 20:05:41 +0000
commite4872f2a52b1929b25e982e7cd050b0f95d73cc1 (patch)
tree6be2a51af84d31725cfeecdea19a4d7b302e2758
parent8db100e4a3283d05fed2ff00b2931e073261487a (diff)
parent8f617d40ab28257914fc4dd5cf64dbba972ba855 (diff)
Merge "DevicePolicyManager#removeKeyPair- update contract" into nyc-dev
-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 5285d52099d9..a1ad59085d8c 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -2750,7 +2750,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 {