diff options
| author | Sander Alewijnse <salewijnse@google.com> | 2014-10-31 10:05:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-31 10:05:36 +0000 |
| commit | a0edff4e94bcf0f1fd8c7d32bb8747e868ba314a (patch) | |
| tree | 1a9aaa59e8a756ed3f055a8c32167c3e865ac31d /core/java | |
| parent | 450f9047ce716ac7b08583436922ad3948f909f1 (diff) | |
| parent | 112e053b9a07972d5ceddc3ad19c7252f3963071 (diff) | |
Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index a30ae573066d..74502fce9a52 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3133,9 +3133,10 @@ public class DevicePolicyManager { } /** - * Called by a profile owner to disable account management for a specific type of account. + * Called by a device owner or profile owner to disable account management for a specific type + * of account. * - * <p>The calling device admin must be a profile owner. If it is not, a + * <p>The calling device admin must be a device owner or profile owner. If it is not, a * security exception will be thrown. * * <p>When account management is disabled for an account type, adding or removing an account |