Adding timestamp and account to contact-level presence columns.

Change-Id: I1ff4f4f5ef9b3b0deb9df3d0689ff39b4b2fd84b

core/java/android/provider/ContactsContract.java

@@ -26,7 +26,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.database.Cursor;
-import android.graphics.BitmapFactory;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.RemoteException;
@@ -240,6 +239,31 @@ public final class ContactsContract {
          */
         public static final String PRESENCE_CUSTOM_STATUS = Presence.PRESENCE_CUSTOM_STATUS;
 
+        /**
+         * The time when the latest presence custom status was inserted/updated.
+         * This column is only returned if explicitly requested in the query
+         * projection.
+         * <p>Type: TEXT</p>
+         */
+        public static final String PRESENCE_CUSTOM_STATUS_TIMESTAMP =
+                Presence.PRESENCE_CUSTOM_STATUS_TIMESTAMP;
+
+        /**
+         * Protocol that supplied the latest status update (see {@link CommonDataKinds.Im#PROTOCOL}.
+         * This column is only returned if explicitly requested in the query
+         * projection.
+         * <p>Type: NUMBER</p>
+         */
+        public static final String PRESENCE_PROTOCOL = "presence_protocol";
+
+        /**
+         * Custom protocol that supplied the latest status update (see
+         * {@link CommonDataKinds.Im#CUSTOM_PROTOCOL}. This column is only
+         * returned if explicitly requested in the query projection.
+         * <p>Type: TEXT</p>
+         */
+        public static final String PRESENCE_CUSTOM_PROTOCOL = "presence_custom_protocol";
+
         /**
          * An indicator of whether this contact has at least one phone number. "1" if there is
          * at least one phone number, "0" otherwise.
@@ -878,6 +902,7 @@ public final class ContactsContract {
     }
 
     public static final class Presence implements PresenceColumns, Im.CommonPresenceColumns {
+
         /**
          * This utility class cannot be instantiated
          */
@@ -940,6 +965,12 @@ public final class ContactsContract {
          * presence detail.
          */
         public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/im-presence";
+
+        /**
+         * The time when the presence custom status was inserted/updated.
+         * <p>Type: TEXT</p>
+         */
+        public static final String PRESENCE_CUSTOM_STATUS_TIMESTAMP = "status_timestamp";
     }
 
     /**
@@ -1699,7 +1730,7 @@ public final class ContactsContract {
 
             /**
              * Thumbnail photo of the raw contact. This is the raw bytes of an image
-             * that could be inflated using {@link BitmapFactory}.
+             * that could be inflated using {@link android.graphics.BitmapFactory}.
              * <p>
              * Type: BLOB
              */