Add new columns to accounts table

Add SIM_SLOT and EF_TYPE columnst to the accounts table

Test: Unit test and manual test (pulling cp2 database after flashing)
Fix: 170653793
Change-Id: I6cfece7c5eab2bb84f4955ae827b972727be318c

2 files changed, 23 insertions, 4 deletions

diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index d64908d5..35a3b968 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -144,7 +144,7 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper {
      *   1500-1599 S
      * </pre>
      */
-    static final int DATABASE_VERSION = 1500;
+    static final int DATABASE_VERSION = 1501;
     private static final int MINIMUM_SUPPORTED_VERSION = 700;
 
     @VisibleForTesting
@@ -700,6 +700,8 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper {
         String ACCOUNT_NAME = RawContacts.ACCOUNT_NAME;
         String ACCOUNT_TYPE = RawContacts.ACCOUNT_TYPE;
         String DATA_SET = RawContacts.DATA_SET;
+        String SIM_SLOT_INDEX = "sim_slot_index";
+        String SIM_EF_TYPE = "sim_ef_type";
 
         String CONCRETE_ACCOUNT_NAME = Tables.ACCOUNTS + "." + ACCOUNT_NAME;
         String CONCRETE_ACCOUNT_TYPE = Tables.ACCOUNTS + "." + ACCOUNT_TYPE;
@@ -1219,8 +1221,10 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper {
                 AccountsColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
                 AccountsColumns.ACCOUNT_NAME + " TEXT, " +
                 AccountsColumns.ACCOUNT_TYPE + " TEXT, " +
-                AccountsColumns.DATA_SET + " TEXT" +
-        ");");
+                AccountsColumns.DATA_SET + " TEXT, " +
+                AccountsColumns.SIM_SLOT_INDEX + " INTEGER, " +
+                AccountsColumns.SIM_EF_TYPE + " INTEGER" +
+                ");");
 
         // Note, there are two sets of the usage stat columns: LR_* and RAW_*.
         // RAW_* contain the real values, which clients can't access.  The column names start
@@ -2583,6 +2587,12 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper {
             oldVersion = 1500;
         }
 
+        if (isUpgradeRequired(oldVersion, newVersion, 1501)) {
+            upgradeToVersion1501(db);
+            upgradeViewsAndTriggers = true;
+            oldVersion = 1501;
+        }
+
         // We extracted "calls" and "voicemail_status" at this point, but we can't remove them here
         // yet, until CallLogDatabaseHelper moves the data.
 
@@ -3356,6 +3366,14 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper {
         }
     }
 
+    private void upgradeToVersion1501(SQLiteDatabase db) {
+        try {
+            db.execSQL("ALTER TABLE accounts ADD sim_slot_index INTEGER;");
+            db.execSQL("ALTER TABLE accounts ADD sim_ef_type INTEGER;");
+        } catch (SQLException ignore) {
+        }
+    }
+
     /**
      * This method is only used in upgradeToVersion1101 method, and should not be used in other
      * places now. Because data15 is not used to generate hash_id for photo, and the new generating
diff --git a/tests/src/com/android/providers/contacts/ContactsDatabaseHelperUpgradeTest.java b/tests/src/com/android/providers/contacts/ContactsDatabaseHelperUpgradeTest.java
index a2bc5ca1..d50a2922 100644
--- a/tests/src/com/android/providers/contacts/ContactsDatabaseHelperUpgradeTest.java
+++ b/tests/src/com/android/providers/contacts/ContactsDatabaseHelperUpgradeTest.java
@@ -59,7 +59,6 @@ import com.android.providers.contacts.ContactsDatabaseHelper.PresenceColumns;
 import com.android.providers.contacts.ContactsDatabaseHelper.RawContactsColumns;
 import com.android.providers.contacts.ContactsDatabaseHelper.StatusUpdatesColumns;
 import com.android.providers.contacts.ContactsDatabaseHelper.Tables;
-import com.android.providers.contacts.testutil.TestUtil;
 import com.android.providers.contacts.util.PropertyUtils;
 
 /**
@@ -221,6 +220,8 @@ public class ContactsDatabaseHelperUpgradeTest extends BaseDatabaseHelperUpgrade
             new TableColumn(AccountsColumns.ACCOUNT_NAME, TEXT, false, null),
             new TableColumn(AccountsColumns.ACCOUNT_TYPE, TEXT, false, null),
             new TableColumn(AccountsColumns.DATA_SET, TEXT, false, null),
+            new TableColumn(AccountsColumns.SIM_SLOT_INDEX, INTEGER, false, null),
+            new TableColumn(AccountsColumns.SIM_EF_TYPE, INTEGER, false, null),
     };
 
     private static final TableColumn[] CONTACTS_COLUMNS = new TableColumn[] {