Tizen 2.4.0 rev3 SDK Public Releasesubmit/tizen_2.4/20160306.235703accepted/tizen/2.4/mobile/20160307.015711tizen_2.4accepted/tizen_2.4_mobile

2 files changed, 19 insertions, 2 deletions

diff --git a/doc/contacts_doc.h b/doc/contacts_doc.h
index ae38a77..4fd6163 100644
--- a/doc/contacts_doc.h
+++ b/doc/contacts_doc.h
@@ -237,7 +237,20 @@
  * contacts_record_add_child_record(contact, _contacts_contact.image, image);
  * @endcode
  *
- *
+ * <table class="note">
+ *    <tbody>
+ *     <tr>
+ *      <th class="note">Note</th>
+ *     </tr>
+ *     <tr>
+ *      <td class="note">For an application to insert private images in contacts, it needs to follow below conditions:<br/>
+ * &nbsp;&nbsp;&nbsp;1. Application must have privilege of http://tizen.org/privilege/contact.write to use APIs such as contacts_db_insert_record().<br/>
+ * &nbsp;&nbsp;&nbsp;2. Application's private directory and files must have 'read' permission of others, '644' for example. But still, SMACK protects read permission from the other applications.<br/>
+ * &nbsp;&nbsp;&nbsp;3. Application may erase the image after destroying the contact record (contacts_record_destroy).<br/>
+ *      </td>
+ *     </tr>
+ *    </tbody>
+ * </table>
  *
  * @section CAPI_SOCIAL_CONTACTS_SVC_MODULE_RECORDS Records
  * In contacts-service, one of basic concept is a record.
diff --git a/include/contacts_views.h b/include/contacts_views.h
index 83b6179..1f0e24e 100644
--- a/include/contacts_views.h
+++ b/include/contacts_views.h
@@ -268,7 +268,7 @@ _CONTACTS_END_READ_ONLY_VIEW(_contacts_simple_contact)
  * <tr><td>string</td><td>_uri</td><td>read only</td><td> Identifier of this contact view  </td></tr>
  * <tr><td>integer</td><td>id</td><td>read only</td><td> DB record ID of the contact </td></tr>
  * <tr><td>string</td><td>display_name</td><td>read only</td><td> Display name of the contact </td></tr>
- * <tr><td>integer</td><td>display_source_id</td><td>read only</td><td> The source type of display name, refer to the @ref contacts_display_name_source_type_e </td></tr>
+ * <tr><td>integer</td><td>display_source_type</td><td>read only</td><td> The source type of display name, refer to the @ref contacts_display_name_source_type_e </td></tr>
  * <tr><td>integer</td><td>address_book_id</td><td>read, write once</td><td> Addressbook ID that the contact belongs to </td></tr>
  * <tr><td>string</td><td>ringtone_path</td><td>read, write</td><td> Ringtone path of the contact </td></tr>
  * <tr><td>string</td><td>image_thumbnail_path</td><td>read only</td><td> Image thumbnail path of the contact </td></tr>
@@ -295,6 +295,7 @@ _CONTACTS_END_READ_ONLY_VIEW(_contacts_simple_contact)
  * <tr><td>record</td><td>relationship</td><td>read, write</td><td> _contacts_relationship child record (multiple)</td></tr>
  * <tr><td>record</td><td>image</td><td>read, write</td><td> _contacts_image child record (multiple)</td></tr>
  * <tr><td>record</td><td>group_relation</td><td>read, write</td><td> _contacts_group_relation child record (multiple)</td></tr>
+ * <tr><td>record</td><td>extension</td><td>read, write</td><td> _contacts_extension child record (multiple)</td></tr>
  * </table>
  */
 _CONTACTS_BEGIN_VIEW()
@@ -360,6 +361,7 @@ _CONTACTS_END_VIEW(_contacts_contact)
  * <tr><td>record</td><td>profile</td><td>read, write</td><td> _contacts_profile child record (multiple) </td></tr>
  * <tr><td>record</td><td>relationship</td><td>read, write</td><td> _contacts_relationship child record (multiple) </td></tr>
  * <tr><td>record</td><td>image</td><td>read, write</td><td> _contacts_image child record (multiple) </td></tr>
+ * <tr><td>record</td><td>extension</td><td>read, write</td><td> _contacts_extension child record (multiple)</td></tr>
  * </table>
  */
 _CONTACTS_BEGIN_VIEW()
@@ -671,6 +673,7 @@ _CONTACTS_END_VIEW(_contacts_relationship)
  * <tr><td>integer</td><td> type </td><td>read, write</td><td> Image type, refer to the @ref contacts_image_type_e </td></tr>
  * <tr><td>string</td><td> label </td><td>read, write</td><td> Custom image type label, when the image type is #CONTACTS_IMAGE_TYPE_CUSTOM </td></tr>
  * <tr><td>string</td><td> path </td><td>read, write</td><td> Image thumbnail path </td></tr>
+ * <tr><td>boolean</td><td> is_default </td><td>read, write</td><td> The image is default image or not </td></tr>
  * </table>
  */
 _CONTACTS_BEGIN_VIEW()
@@ -1646,6 +1649,7 @@ _CONTACTS_END_READ_ONLY_VIEW(_contacts_contact_grouprel)
  * <tr><td>string</td><td>display_name</td><td> Display name of the contact that the activity belongs to </td></tr>
  * <tr><td>integer</td><td>display_source_type</td><td> The source type of display name that the activity belongs to </td></tr>
  * <tr><td>integer</td><td>address_book_id</td><td> Addressbook that the activity belongs to </td></tr>
+ * <tr><td>integer</td><td>account_id</td><td> Account ID that the activity belongs to </td></tr>
  * <tr><td>integer</td><td>person_id</td><td> Person ID that the activity belongs to </td></tr>
  * <tr><td>string</td><td>ringtone_path</td><td> Ringtone path of the contact that the activity belongs to (projection) </td></tr>
  * <tr><td>string</td><td>image_thumbnail_path</td><td> Image thumbnail path of the contact that the activity belongs to (projection) </td></tr>