From 2a8f129c2ac16550cacf85dccef73f90f263144a Mon Sep 17 00:00:00 2001 From: Benjamin Miller Date: Fri, 29 Jun 2018 08:07:47 +0000 Subject: [PATCH] Docs: generateKeyPair() can't be called from the main thread. Bug: 110194933 Test: make ds-docs with visual inspection of generated HTML Change-Id: I5f7839cbf57d9150ad4c9a9c4ac943064fb1f6c0 --- core/java/android/app/admin/DevicePolicyManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 5e7f1e40f9c79..bbdc5323648d0 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -4153,8 +4153,11 @@ public class DevicePolicyManager { * Called by a device or profile owner, or delegated certificate installer, to generate a * new private/public key pair. If the device supports key generation via secure hardware, * this method is useful for creating a key in KeyChain that never left the secure hardware. - * * Access to the key is controlled the same way as in {@link #installKeyPair}. + * + *

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. + * * @param admin Which {@link DeviceAdminReceiver} this request is associated with, or * {@code null} if calling from a delegated certificate installer. * @param algorithm The key generation algorithm, see {@link java.security.KeyPairGenerator}.