From 1440fb9d8e4edefb57336532734f7cbab13a955f Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Mon, 8 Jun 2015 14:41:40 -0700
Subject: Actually make CARRIER_PRESENCE accessible

Bug 20257870

Change-Id: I5e7e12372dde1aeffaea1e953c16d86e341c3b66
---
 src/com/android/providers/contacts/ContactsDatabaseHelper.java    | 8 +++++++-
 src/com/android/providers/contacts/ContactsProvider2.java         | 1 +
 .../src/com/android/providers/contacts/ContactsProvider2Test.java | 7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

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)
diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index d75996c..3c21d21 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -368,6 +368,7 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
                 Data.DATA13,
                 Data.DATA14,
                 Data.DATA15,
+                Data.CARRIER_PRESENCE,
                 Data.SYNC1,
                 Data.SYNC2,
                 Data.SYNC3,
@@ -454,6 +455,7 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
                 Data.DATA13,
                 Data.DATA14,
                 Data.DATA15,
+                Data.CARRIER_PRESENCE,
                 Data.SYNC1,
                 Data.SYNC2,
                 Data.SYNC3,
@@ -535,6 +537,7 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
                 Data.DATA13,
                 Data.DATA14,
                 Data.DATA15,
+                Data.CARRIER_PRESENCE,
                 Data.SYNC1,
                 Data.SYNC2,
                 Data.SYNC3,
@@ -642,6 +645,7 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
                 Data.DATA13,
                 Data.DATA14,
                 Data.DATA15,
+                Data.CARRIER_PRESENCE,
                 Data.SYNC1,
                 Data.SYNC2,
                 Data.SYNC3,
@@ -6143,6 +6147,7 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
         values.put(Data.DATA13, "old13");
         values.put(Data.DATA14, "old14");
         values.put(Data.DATA15, "old15");
+        values.put(Data.CARRIER_PRESENCE, 0);
         Uri uri = mResolver.insert(Data.CONTENT_URI, values);
         assertStoredValues(uri, values);
         assertNetworkNotified(true);
@@ -6166,6 +6171,7 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
         values.put(Data.DATA13, "new13");
         values.put(Data.DATA14, "new14");
         values.put(Data.DATA15, "new15");
+        values.put(Data.CARRIER_PRESENCE, Data.CARRIER_PRESENCE_VT_CAPABLE);
         mResolver.update(Data.CONTENT_URI, values, Data.RAW_CONTACT_ID + "=" + rawContactId +
                 " AND " + Data.MIMETYPE + "='testmimetype'", null);
         assertNetworkNotified(true);
@@ -9201,6 +9207,7 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
         values.put(Data.DATA13, "thirteen");
         values.put(Data.DATA14, "fourteen");
         values.put(Data.DATA15, "fifteen");
+        values.put(Data.CARRIER_PRESENCE, Data.CARRIER_PRESENCE_VT_CAPABLE);
         values.put(Data.SYNC1, "sync1");
         values.put(Data.SYNC2, "sync2");
         values.put(Data.SYNC3, "sync3");
-- 
cgit v1.1