Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a8f129c authored by Benjamin Miller's avatar Benjamin Miller
Browse files

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
parent 1612941d

core/java/android/app/admin/DevicePolicyManager.java

+4 −1
Original line number Diff line number Diff line
@@ -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}.

     *

     * <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.

     *

     * @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}.