Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'a0edff4e94bcf0f1fd8c7d32bb8747e868ba314a':
  Change javadoc of setAccountManagementDisabled.
This commit is contained in:
Sander Alewijnse
2014-10-31 10:11:56 +00:00
committed by Android Git Automerger
parent 2257fe8a75 a0edff4e94
commit 94efda638e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/admin/DevicePolicyManager.java
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