am 94efda63: am a0edff4e: Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev

* commit '94efda638e9789cacfbdffae6c6d6fae1dd41667':
  Change javadoc of setAccountManagementDisabled.
This commit is contained in:
Sander Alewijnse
2014-10-31 10:20:08 +00:00
committed by Android Git Automerger

View File

@@ -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