summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Chan <mchan@android.com> 2011-11-23 12:14:16 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-23 12:14:16 -0800
commita181a9197c0affbcddd627c625c8064f494b94d6 (patch)
tree56716a54e37f4c19470f08126aaa7f341cbe8e8b
parent18f05518a882eeb778433c65bff27831a8accdc2 (diff)
parent37ac88f994c5b8af291acd9c8d7eb5e22ce3c489 (diff)
am 37ac88f9: Merge "Update description of account_type" into ics-mr1
* commit '37ac88f994c5b8af291acd9c8d7eb5e22ce3c489': Update description of account_type
-rw-r--r--docs/html/guide/topics/providers/calendar-provider.jd8
1 files changed, 3 insertions, 5 deletions
diff --git a/docs/html/guide/topics/providers/calendar-provider.jd b/docs/html/guide/topics/providers/calendar-provider.jd
index 3ab51259a518..d30dda423ec5 100644
--- a/docs/html/guide/topics/providers/calendar-provider.jd
+++ b/docs/html/guide/topics/providers/calendar-provider.jd
@@ -280,11 +280,9 @@ Calendars.ACCOUNT_NAME}, you must also include
{@link android.provider.CalendarContract.Calendars#ACCOUNT_TYPE Calendars.ACCOUNT_TYPE}
in the selection. That is because a given account is
only considered unique given both its <code>ACCOUNT_NAME</code> and its
-<code>ACCOUNT_TYPE</code>. The <code>ACCOUNT_TYPE</code> refers to the way that
-the account is being synced. It is often but not always the domain. For
-example, an account could be synced through a corporate pop3 sync adapter, in which
-case the <code>ACCOUNT_TYPE</code> would not be a domain. There is also a
-special type of account called {@link
+<code>ACCOUNT_TYPE</code>. The <code>ACCOUNT_TYPE</code> is the string corresponding to the
+account authenticator that was used when the account was registered with the
+{@link android.accounts.AccountManager}. There is also a special type of account called {@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} for calendars not
associated with a device account. {@link
android.provider.CalendarContract#ACCOUNT_TYPE_LOCAL} accounts do not get