diff options
| -rw-r--r-- | src/com/android/providers/contacts/ContactsDatabaseHelper.java | 7 | ||||
| -rw-r--r-- | src/com/android/providers/contacts/LegacyApiSupport.java | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java index 504e604b..6b22e206 100644 --- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java +++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java @@ -61,7 +61,7 @@ import java.util.HashMap; /* package */ class ContactsDatabaseHelper extends SQLiteOpenHelper { private static final String TAG = "ContactsDatabaseHelper"; - private static final int DATABASE_VERSION = 102; + private static final int DATABASE_VERSION = 103; private static final String DATABASE_NAME = "contacts2.db"; private static final String DATABASE_PRESENCE = "presence_db"; @@ -1322,6 +1322,11 @@ import java.util.HashMap; oldVersion++; } + if (oldVersion == 102) { + LegacyApiSupport.createDatabase(db); + oldVersion++; + } + if (oldVersion != newVersion) { throw new IllegalStateException( "error upgrading the database to version " + newVersion); diff --git a/src/com/android/providers/contacts/LegacyApiSupport.java b/src/com/android/providers/contacts/LegacyApiSupport.java index 6654403b..a26881d5 100644 --- a/src/com/android/providers/contacts/LegacyApiSupport.java +++ b/src/com/android/providers/contacts/LegacyApiSupport.java @@ -20,6 +20,7 @@ import com.android.providers.contacts.ContactsDatabaseHelper.ExtensionsColumns; import com.android.providers.contacts.ContactsDatabaseHelper.GroupsColumns; import com.android.providers.contacts.ContactsDatabaseHelper.MimetypesColumns; import com.android.providers.contacts.ContactsDatabaseHelper.PhoneColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.PhoneLookupColumns; import com.android.providers.contacts.ContactsDatabaseHelper.PresenceColumns; import com.android.providers.contacts.ContactsDatabaseHelper.RawContactsColumns; import com.android.providers.contacts.ContactsDatabaseHelper.StatusUpdatesColumns; @@ -637,10 +638,14 @@ public class LegacyApiSupport { + " AS " + android.provider.Contacts.Phones.TYPE + ", " + Tables.DATA + "." + Phone.LABEL + " AS " + android.provider.Contacts.Phones.LABEL + ", " + - PhoneColumns.CONCRETE_NORMALIZED_NUMBER + Tables.PHONE_LOOKUP + "." + PhoneLookupColumns.NORMALIZED_NUMBER + " AS " + android.provider.Contacts.Phones.NUMBER_KEY + ", " + peopleColumns + - " FROM " + Tables.DATA + DATA_JOINS + + " FROM " + Tables.DATA + + " JOIN " + Tables.PHONE_LOOKUP + + " ON (" + Tables.DATA + "._id = " + + Tables.PHONE_LOOKUP + "." + PhoneLookupColumns.DATA_ID + ")" + + DATA_JOINS + " WHERE " + MimetypesColumns.CONCRETE_MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" + " AND " + Tables.RAW_CONTACTS + "." + RawContacts.DELETED + "=0" |