diff options
| author | Makoto Onuki <omakoto@google.com> | 2015-06-08 14:41:40 -0700 |
|---|---|---|
| committer | Makoto Onuki <omakoto@google.com> | 2015-06-08 15:07:02 -0700 |
| commit | 1440fb9d8e4edefb57336532734f7cbab13a955f (patch) | |
| tree | 84496dd3c6b02ec80e8c0ea4f714ad6884d49e31 /src/com/android | |
| parent | 47fc56dd40613fae565d0c4d630f5f0b5fc310ff (diff) | |
| download | packages_providers_ContactsProvider-1440fb9d8e4edefb57336532734f7cbab13a955f.zip packages_providers_ContactsProvider-1440fb9d8e4edefb57336532734f7cbab13a955f.tar.gz packages_providers_ContactsProvider-1440fb9d8e4edefb57336532734f7cbab13a955f.tar.bz2 | |
Actually make CARRIER_PRESENCE accessible
Bug 20257870
Change-Id: I5e7e12372dde1aeffaea1e953c16d86e341c3b66
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/providers/contacts/ContactsDatabaseHelper.java | 8 | ||||
| -rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java index bbde779..2bccea1 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 = 1009; + static final int DATABASE_VERSION = 1010; public interface Tables { public static final String CONTACTS = "contacts"; @@ -1872,6 +1872,7 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { + Data.DATA13 + ", " + Data.DATA14 + ", " + Data.DATA15 + ", " + + Data.CARRIER_PRESENCE + ", " + Data.SYNC1 + ", " + Data.SYNC2 + ", " + Data.SYNC3 + ", " @@ -2937,6 +2938,11 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { oldVersion = 1009; } + if (oldVersion < 1010) { + upgradeViewsAndTriggers = true; + oldVersion = 1010; + } + 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 7e91192..72512b7 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -712,6 +712,7 @@ public class ContactsProvider2 extends AbstractContactsProvider .add(Data.DATA13) .add(Data.DATA14) .add(Data.DATA15) + .add(Data.CARRIER_PRESENCE) .add(Data.DATA_VERSION) .add(Data.IS_PRIMARY) .add(Data.IS_SUPER_PRIMARY) |