Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add the lookup_key column, which should have been in the previous CL"

Browse Source
This commit is contained in:
Daniel Lehmann
2011-08-29 15:51:56 -07:00
committed by Android (Google) Code Review
parent 03605fa832 ceb476a584
commit 82e0c6f3de
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -16714,6 +16714,7 @@ package android.provider {
field public static final java.lang.String ACCOUNT_TYPE = "account_type";
field public static final java.lang.String COMMENTS = "comments";
field public static final java.lang.String CONTACT_ID = "contact_id";
field public static final java.lang.String CONTACT_LOOKUP_KEY = "contact_lookup";
field public static final java.lang.String DATA_SET = "data_set";
field public static final java.lang.String RAW_CONTACT_ID = "raw_contact_id";
field public static final java.lang.String RAW_CONTACT_SOURCE_ID = "raw_contact_source_id";

17
core/java/android/provider/ContactsContract.java
View File

@@ -3083,12 +3083,25 @@ public final class ContactsContract {
/**
* A reference to the {@link android.provider.ContactsContract.Contacts#_ID}
* that this stream item belongs to.
*
* <p>Type: INTEGER</p>
* <p>read-only</p>
*/
public static final String CONTACT_ID = "contact_id";
/**
* A reference to the {@link android.provider.ContactsContract.Contacts#LOOKUP_KEY}
* that this stream item belongs to.
*
* <p>Type: TEXT</p>
* <p>read-only</p>
*/
public static final String CONTACT_LOOKUP_KEY = "contact_lookup";
/**
* A reference to the {@link RawContacts#_ID}
* that this stream item belongs to.
* <p>Type: INTEGER</p>
*/
public static final String RAW_CONTACT_ID = "raw_contact_id";
@@ -3104,7 +3117,7 @@ public final class ContactsContract {
* The account type to which the raw_contact of this item is associated. See
* {@link RawContacts#ACCOUNT_TYPE}
*
* <p>TYPE: text</p>
* <p>Type: TEXT</p>
* <p>read-only</p>
*/
public static final String ACCOUNT_TYPE = "account_type";
@@ -3113,7 +3126,7 @@ public final class ContactsContract {
* The account name to which the raw_contact of this item is associated. See
* {@link RawContacts#ACCOUNT_NAME}
*
* <p>TYPE: text</p>
* <p>Type: TEXT</p>
* <p>read-only</p>
*/
public static final String ACCOUNT_NAME = "account_name";