summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-03-16 12:12:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-03-16 12:12:53 +0000
commit317603dc2fbc5a372001e402d4fd6cc846b58b02 (patch)
treeb8ee4ec13ec901249fd65ff61f280c28a2f40817 /core/java
parentdee20d12dc8e9034b3cb574cc0f58e0e3334ae68 (diff)
parent4b06918fcd2f69e75c2cc5888a0b62167d916033 (diff)
Merge "Improve doc for DPM.generateKeyPair" into rvc-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 224035997def..bc8d05e0810e 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -5215,6 +5215,10 @@ public class DevicePolicyManager {
* <p>Because this method might take several seconds to complete, it should only be called from
* a worker thread. This method returns {@code null} when called from the main thread.
*
+ * <p>This method is not thread-safe, calling it from multiple threads at the same time will
+ * result in undefined behavior. If the calling thread is interrupted while the invocation is
+ * in-flight, it will eventually terminate and return {@code null}.
+ *
* <p>Note: If the provided {@code alias} is of an existing alias, all former grants that apps
* have been given to access the key and certificates associated with this alias will be
* revoked.