commit cc432cc08919cec386213f993b36bfdc5adf6ed0
author Fyodor Kupolov <fkupolov@google.com> Tue Jul 21 21:31:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 21 21:31:44 2015 +0000
tree fd59dcf2d09b444544ea59bbd401baaa08e98acc
parent f8db3c64984de6c2220578d4c9c12570c3d752b8
parent 5211528b9d1f51dca284d40e8d63dc3bc9527ac7

am 5211528b: am 67cd2fc5: am cf6500b9: am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev

* commit '5211528b9d1f51dca284d40e8d63dc3bc9527ac7':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction

core/java/android/os/UserManager.java

diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index b104135..79fb805 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -45,7 +45,9 @@
     private final Context mContext;
 
     /**
-     * Specifies if a user is disallowed from adding and removing accounts.
+     * Specifies if a user is disallowed from adding and removing accounts, unless they are
+     * {@link android.accounts.AccountManager#addAccountExplicitly programmatically} added by
+     * Authenticator.
      * The default value is <code>false</code>.
      *
      * <p/>Key for user restrictions.