diff options
| author | Daniel Lehmann <lehmannd@google.com> | 2010-04-15 15:52:32 -0700 |
|---|---|---|
| committer | Daniel Lehmann <lehmannd@google.com> | 2010-04-15 17:29:41 -0700 |
| commit | 80d7871ca31d604cbfd857661d5300bb090076db (patch) | |
| tree | 7dd0bc700d6d6b94af909cb96726888ad895cde4 /src/com/android/providers | |
| parent | 39f93a31c44d75f276f8f6bb7691674a76c7c1de (diff) | |
| download | packages_providers_ContactsProvider-80d7871ca31d604cbfd857661d5300bb090076db.zip packages_providers_ContactsProvider-80d7871ca31d604cbfd857661d5300bb090076db.tar.gz packages_providers_ContactsProvider-80d7871ca31d604cbfd857661d5300bb090076db.tar.bz2 | |
Add NAME_RAW_CONTACT_ID to view_contacts
Change-Id: Ib889d1cc43e4551b9f7887bf3c808140f2bf16a3
Diffstat (limited to 'src/com/android/providers')
| -rw-r--r-- | src/com/android/providers/contacts/ContactsDatabaseHelper.java | 11 | ||||
| -rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java index 6a76a0b..c6cd8bd 100644 --- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java +++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java @@ -73,7 +73,7 @@ import java.util.Locale; /* package */ class ContactsDatabaseHelper extends SQLiteOpenHelper { private static final String TAG = "ContactsDatabaseHelper"; - private static final int DATABASE_VERSION = 309; + private static final int DATABASE_VERSION = 310; private static final String DATABASE_NAME = "contacts2.db"; private static final String DATABASE_PRESENCE = "presence_db"; @@ -1227,7 +1227,8 @@ import java.util.Locale; + " AS " + Contacts.STARRED + ", " + ContactsColumns.CONCRETE_TIMES_CONTACTED + " AS " + Contacts.TIMES_CONTACTED + ", " - + ContactsColumns.LAST_STATUS_UPDATE_ID; + + ContactsColumns.LAST_STATUS_UPDATE_ID + ", " + + Contacts.NAME_RAW_CONTACT_ID; String contactsSelect = "SELECT " + ContactsColumns.CONCRETE_ID + " AS " + Contacts._ID + "," @@ -1487,6 +1488,12 @@ import java.util.Locale; oldVersion = 309; } + if (oldVersion == 309) { + // Add column NAME_RAW_CONTACT_ID + upgradeViewsAndTriggers = true; + oldVersion = 310; + } + if (upgradeViewsAndTriggers) { createContactsViews(db); createGroupsView(db); diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index 6a9d918..ab1e6fd 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -529,6 +529,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun sContactsProjectionMap.put(Contacts.HAS_PHONE_NUMBER, Contacts.HAS_PHONE_NUMBER); sContactsProjectionMap.put(Contacts.SEND_TO_VOICEMAIL, Contacts.SEND_TO_VOICEMAIL); sContactsProjectionMap.put(Contacts.LOOKUP_KEY, Contacts.LOOKUP_KEY); + sContactsProjectionMap.put(Contacts.NAME_RAW_CONTACT_ID, Contacts.NAME_RAW_CONTACT_ID); // Handle projections for Contacts-level statuses addProjection(sContactsProjectionMap, Contacts.CONTACT_PRESENCE, |