diff options
| author | Eran Messeri <eranm@google.com> | 2019-10-18 13:10:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-10-18 13:10:51 +0000 |
| commit | 111dfdfdae8b38797cae52badfbdd9efdd693856 (patch) | |
| tree | 774f88d2d12de949e7552517d9f30ea7cff2f6ff /core/java | |
| parent | 1ea7ca442d9e933f8ddf79f72ab30c0875705148 (diff) | |
| parent | 128703b70da96be37608c15e1270de866c22a819 (diff) | |
Merge "Documentation: Indicate DPM method does I/O"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 46d5296b279d..375a06efba74 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -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 * 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 filter The IntentFilter for which a default handler is added. * @param activity The Activity that is added as default intent handler. |