summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fyodor Kupolov <fkupolov@google.com> 2015-07-21 21:49:41 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-21 21:49:41 +0000
commita48c0304bfc72dbf422382ced0a5b2705a7bfd9f (patch)
tree4cf514019d82431a274d33296205253702bc550a
parent9ade08733fe0ffa6ac97e480facfe230dacfe53c (diff)
parentcc432cc08919cec386213f993b36bfdc5adf6ed0 (diff)
am cc432cc0: am 5211528b: am 67cd2fc5: am cf6500b9: am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
* commit 'cc432cc08919cec386213f993b36bfdc5adf6ed0': Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
-rw-r--r--core/java/android/os/UserManager.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 5c21a07086c5..7915a76856d4 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -46,7 +46,9 @@ public class UserManager {
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.