commit 815b42f48deca85e5b3f9221a9cb2fb7ee852497
author Vasu Nori <vnori@google.com> Tue Sep 25 10:07:14 2018 -0700
committer Scott Randolph <randolphs@google.com> Wed Jan 23 14:26:27 2019 -0800
tree 1db469d0ee8e67e0211a1434a1da4f23d473ebe7
parent 9868df48edd595ea206f2d62f3aede89925a8ddc

Add a new column: subscription_type to siminfo table.

This is for Remote-SIM feature.
Design doc http://shortn/_GG690j15js

Bug: 112321331
Test: tested manually and also w/ unittests
Change-Id: Ice3000cfd58947777e2d2e047ebbc1d0dd5b11d2

src/com/android/providers/telephony/TelephonyProvider.java

diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 3f28e1d..071005b 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -143,7 +143,7 @@
     private static final boolean DBG = true;
     private static final boolean VDBG = false; // STOPSHIP if true
 
-    private static final int DATABASE_VERSION = 34 << 16;
+    private static final int DATABASE_VERSION = 35 << 16;
     private static final int URL_UNKNOWN = 0;
     private static final int URL_TELEPHONY = 1;
     private static final int URL_CURRENT = 2;
@@ -388,7 +388,9 @@
                 + SubscriptionManager.ISO_COUNTRY_CODE + " TEXT,"
                 + SubscriptionManager.CARRIER_ID + " INTEGER DEFAULT -1,"
                 + SubscriptionManager.PROFILE_CLASS + " INTEGER DEFAULT "
-                + SubscriptionManager.PROFILE_CLASS_DEFAULT
+                + SubscriptionManager.PROFILE_CLASS_DEFAULT + ","
+                + SubscriptionManager.SUBSCRIPTION_TYPE
+                + " INTEGER DEFAULT " + SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM
                 + ");";
     }
 
@@ -1231,6 +1233,21 @@
                 oldVersion = 34 << 16 | 6;
             }
 
+            if (oldVersion < (35 << 16 | 6)) {
+                try {
+                    // Try to update the siminfo table. It might not be there.
+                    db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN "
+                        + SubscriptionManager.SUBSCRIPTION_TYPE + " INTEGER DEFAULT "
+                        + SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM + ";");
+                } catch (SQLiteException e) {
+                    if (DBG) {
+                        log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " +
+                            "The table will get created in onOpen.");
+                    }
+                }
+                oldVersion = 29 << 16 | 6;
+            }
+
             if (DBG) {
                 log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);
             }

tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java

diff --git a/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java b/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java
index a4f31d9..c76701c 100644
--- a/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java
+++ b/tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java
@@ -27,6 +27,7 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.support.test.InstrumentationRegistry;
 import android.telephony.SubscriptionManager;
+import android.test.suitebuilder.annotation.SmallTest;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -39,6 +40,12 @@
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * To run this test, run the following from the dir: packages/providers/TelephonyProvider
+ *    atest TelephonyProviderTests:TelephonyDatabaseHelperTest
+ * Or
+ *    runtest --path tests/src/com/android/providers/telephony/TelephonyDatabaseHelperTest.java
+ */
 @RunWith(JUnit4.class)
 public final class TelephonyDatabaseHelperTest {
 
@@ -148,6 +155,21 @@
                 fullColumns, upgradedColumns);
     }
 
+    @Test
+    public void databaseHelperOnUpgrade_hasSubscriptionTypeField() {
+        Log.d(TAG, "databaseHelperOnUpgrade_hasSubscriptionTypeField");
+        // (5 << 16 | 6) is the first upgrade trigger in onUpgrade
+        SQLiteDatabase db = mInMemoryDbHelper.getWritableDatabase();
+        mHelper.onUpgrade(db, (4 << 16), TelephonyProvider.DatabaseHelper.getVersion(mContext));
+
+        // the upgraded db must have the SubscriptionManager.SUBSCRIPTION_TYPE field
+        Cursor cursor = db.query("siminfo", null, null, null, null, null, null);
+        String[] upgradedColumns = cursor.getColumnNames();
+        Log.d(TAG, "siminfo columns: " + Arrays.toString(upgradedColumns));
+
+        assertTrue(Arrays.asList(upgradedColumns).contains(SubscriptionManager.SUBSCRIPTION_TYPE));
+    }
+
     /**
      * Helper for an in memory DB used to test the TelephonyProvider#DatabaseHelper.
      *