commit 2c1dcfdabb3bacf759cf9f378ab7e85772d5bfa6
author Michael Chan <mchan@android.com> Tue Apr 17 21:27:53 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 17 21:27:53 2012 -0700
tree 33b2bdaa51f287d13e47b34d0f2e367c08eb74ea
parent 6947fd0f96764a64ca6addeb2871f4d12b0b9238
parent 37f1d29784ecedf8c1f1ac128c72ef3bfb5c7066

Merge "Added identity and namespace to Calendar Attendees"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 7698924..2a54f2b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -16265,6 +16265,8 @@
 
   protected static abstract interface CalendarContract.AttendeesColumns {
     field public static final java.lang.String ATTENDEE_EMAIL = "attendeeEmail";
+    field public static final java.lang.String ATTENDEE_IDENTITY = "attendeeIdentity";
+    field public static final java.lang.String ATTENDEE_ID_NAMESPACE = "attendeeIdNamespace";
     field public static final java.lang.String ATTENDEE_NAME = "attendeeName";
     field public static final java.lang.String ATTENDEE_RELATIONSHIP = "attendeeRelationship";
     field public static final java.lang.String ATTENDEE_STATUS = "attendeeStatus";

core/java/android/provider/CalendarContract.java

diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java
index eab456c..c4aa691 100644
--- a/core/java/android/provider/CalendarContract.java
+++ b/core/java/android/provider/CalendarContract.java
@@ -760,18 +760,16 @@
         /**
          * The identity of the attendee as referenced in
          * {@link ContactsContract.CommonDataKinds.Identity#IDENTITY}.
-         * This is required only if ATTENDEE_ID_NAMESPACE is present. Column name.
+         * This is required only if {@link #ATTENDEE_ID_NAMESPACE} is present. Column name.
          * <P>Type: STRING</P>
-         * @hide
          */
         public static final String ATTENDEE_IDENTITY = "attendeeIdentity";
 
         /**
          * The identity name space of the attendee as referenced in
          * {@link ContactsContract.CommonDataKinds.Identity#NAMESPACE}.
-         * This is required only if ATTENDEE_IDENTITY is present. Column name.
+         * This is required only if {@link #ATTENDEE_IDENTITY} is present. Column name.
          * <P>Type: STRING</P>
-         * @hide
          */
         public static final String ATTENDEE_ID_NAMESPACE = "attendeeIdNamespace";
     }