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

Commit c886324a authored by Benjamin Miller's avatar Benjamin Miller Committed by android-build-merger
Browse files

Merge "Docs: update the method description for installKeyPair() to cover... 

Merge "Docs: update the method description for installKeyPair() to cover parameter change." into pi-dev
am: 5037beea

Change-Id: I36650a1acc5e6eaf9c192f12927425c253bb0b6d
parents 009370c0 5037beea

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

+2 −2
Original line number Diff line number Diff line
@@ -4066,8 +4066,8 @@ public class DevicePolicyManager { 
     * immediately, without user approval. It is a best practice not to request this unless strictly

     * necessary since it opens up additional security vulnerabilities.

     *

     * <p>Whether this key is offered to the user for approval at all or not depends on the

     * {@code isUserSelectable} parameter.

     * <p>Include {@link #INSTALLKEY_SET_USER_SELECTABLE} in the {@code flags} argument to allow

     * the user to select the key from a dialog.

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with, or

     *        {@code null} if calling from a delegated certificate installer.