Merge "Actually make CARRIER_PRESENCE accessible (for master)"
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index c44142e..0033dfe 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -127,7 +127,7 @@
* 1100-1199 N
* </pre>
*/
- static final int DATABASE_VERSION = 1102;
+ static final int DATABASE_VERSION = 1103;
public interface Tables {
public static final String CONTACTS = "contacts";
@@ -1904,6 +1904,7 @@
+ Data.DATA13 + ", "
+ Data.DATA14 + ", "
+ Data.DATA15 + ", "
+ + Data.CARRIER_PRESENCE + ", "
+ Data.SYNC1 + ", "
+ Data.SYNC2 + ", "
+ Data.SYNC3 + ", "
@@ -2990,6 +2991,11 @@
oldVersion = 1102;
}
+ if (oldVersion < 1103) {
+ upgradeViewsAndTriggers = true;
+ oldVersion = 1103;
+ }
+
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 ddd1d5e..9149f7c 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -735,6 +735,7 @@
.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 5c36448..6a7a1bc 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -370,6 +370,7 @@
Data.DATA13,
Data.DATA14,
Data.DATA15,
+ Data.CARRIER_PRESENCE,
Data.SYNC1,
Data.SYNC2,
Data.SYNC3,
@@ -457,6 +458,7 @@
Data.DATA13,
Data.DATA14,
Data.DATA15,
+ Data.CARRIER_PRESENCE,
Data.SYNC1,
Data.SYNC2,
Data.SYNC3,
@@ -538,6 +540,7 @@
Data.DATA13,
Data.DATA14,
Data.DATA15,
+ Data.CARRIER_PRESENCE,
Data.SYNC1,
Data.SYNC2,
Data.SYNC3,
@@ -645,6 +648,7 @@
Data.DATA13,
Data.DATA14,
Data.DATA15,
+ Data.CARRIER_PRESENCE,
Data.SYNC1,
Data.SYNC2,
Data.SYNC3,
@@ -6345,6 +6349,7 @@
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);
@@ -6368,6 +6373,7 @@
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);
@@ -9504,6 +9510,7 @@
values.put(Data.DATA13, "thirteen");
values.put(Data.DATA14, "fourteen");
values.put(Data.DATA15, "fifteen".getBytes());
+ 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");