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

Commit 111dfdfd authored by Eran Messeri's avatar Eran Messeri Committed by Android (Google) Code Review
Browse files

Merge "Documentation: Indicate DPM method does I/O"

parents 1ea7ca44 128703b7

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -6633,6 +6633,8 @@ public class DevicePolicyManager { 
     * The calling device admin must be a profile owner or device owner. If it is not, a security

     * The calling device admin must be a profile owner or device owner. If it is not, a security

     * exception will be thrown.

     * exception will be thrown.

     *

     *

     * <p>NOTE: Performs disk I/O and shouldn't be called on the main thread.

     *

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

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

     * @param filter The IntentFilter for which a default handler is added.

     * @param filter The IntentFilter for which a default handler is added.

     * @param activity The Activity that is added as default intent handler.

     * @param activity The Activity that is added as default intent handler.