diff options
| author | Etan Cohen <etancohen@google.com> | 2015-05-20 21:37:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-20 21:38:07 +0000 |
| commit | d93008163a8a2a4a877506eacdc4c4b1b2ad840e (patch) | |
| tree | 3d77440298236220c60d0599ae3c7b8d55c63997 /src/com | |
| parent | 2d745a84f01381ac24d703f992cfb66f65093d0e (diff) | |
| parent | bdeea8a03680da2754df018b6a76e0e7fb99af84 (diff) | |
| download | packages_providers_ContactsProvider-d93008163a8a2a4a877506eacdc4c4b1b2ad840e.tar.gz packages_providers_ContactsProvider-d93008163a8a2a4a877506eacdc4c4b1b2ad840e.tar.bz2 packages_providers_ContactsProvider-d93008163a8a2a4a877506eacdc4c4b1b2ad840e.zip | |
Merge "Implement Data.CARRIER_PRESENCE" into mnc-dev
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/providers/contacts/ContactsDatabaseHelper.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java index 2e37e139..bbde779c 100644 --- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java +++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java @@ -122,7 +122,7 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { * 1000-1099 M * </pre> */ - static final int DATABASE_VERSION = 1008; + static final int DATABASE_VERSION = 1009; public interface Tables { public static final String CONTACTS = "contacts"; @@ -1361,7 +1361,8 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { Data.SYNC1 + " TEXT, " + Data.SYNC2 + " TEXT, " + Data.SYNC3 + " TEXT, " + - Data.SYNC4 + " TEXT " + + Data.SYNC4 + " TEXT, " + + Data.CARRIER_PRESENCE + " INTEGER NOT NULL DEFAULT 0 " + ");"); db.execSQL("CREATE INDEX data_raw_contact_id ON " + Tables.DATA + " (" + @@ -2931,6 +2932,11 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { oldVersion = 1008; } + if (oldVersion < 1009) { + upgradeToVersion1009(db); + oldVersion = 1009; + } + if (upgradeViewsAndTriggers) { createContactsViews(db); createGroupsView(db); @@ -4473,6 +4479,10 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { "raw_contact_backup_id, account_id);"); } + public void upgradeToVersion1009(SQLiteDatabase db) { + db.execSQL("ALTER TABLE data ADD carrier_presence INTEGER NOT NULL DEFAULT 0"); + } + public String extractHandleFromEmailAddress(String email) { Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(email); if (tokens.length == 0) { |