Remove the obsolete account columns from newly created db
Bug 5884869
Change-Id: I2cbec01766883a469fb5558306d6a9b7745845b8
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index bfa317d..2fdcd48 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -973,11 +973,6 @@
RawContacts._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
RawContactsColumns.ACCOUNT_ID + " INTEGER REFERENCES " +
Tables.ACCOUNTS + "(" + AccountsColumns._ID + ")," +
- // STOPSHIP Remove the account columns.
- RawContacts.ACCOUNT_NAME + " STRING DEFAULT NULL, " +
- RawContacts.ACCOUNT_TYPE + " STRING DEFAULT NULL, " +
- RawContacts.DATA_SET + " STRING DEFAULT NULL, " +
-
RawContacts.SOURCE_ID + " TEXT," +
RawContacts.RAW_CONTACT_IS_READ_ONLY + " INTEGER NOT NULL DEFAULT 0," +
RawContacts.VERSION + " INTEGER NOT NULL DEFAULT 1," +
@@ -1177,12 +1172,6 @@
GroupsColumns.PACKAGE_ID + " INTEGER REFERENCES package(_id)," +
GroupsColumns.ACCOUNT_ID + " INTEGER REFERENCES " +
Tables.ACCOUNTS + "(" + AccountsColumns._ID + ")," +
-
- // STOPSHIP Remove the account columns.
- Groups.ACCOUNT_NAME + " STRING DEFAULT NULL, " +
- Groups.ACCOUNT_TYPE + " STRING DEFAULT NULL, " +
- Groups.DATA_SET + " STRING DEFAULT NULL, " +
-
Groups.SOURCE_ID + " TEXT," +
Groups.VERSION + " INTEGER NOT NULL DEFAULT 1," +
Groups.DIRTY + " INTEGER NOT NULL DEFAULT 0," +