Merge "Added identity and namespace to Calendar Attendees"

Author: Michael Chan

api/current.txt

@@ -16265,6 +16265,8 @@ package android.provider {
 
   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

@@ -760,18 +760,16 @@ protected interface AttendeesColumns {
         /**
          * 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";
     }