commit 1b54e62d20e24eb3aae044be5631b20a07d6f548
author Xiangyu/Malcolm Chen <refuhoo@google.com> Thu Nov 29 18:50:03 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 29 18:50:03 2018 +0000
tree 1e668f9268845e87f46cf70be8388d8aedaca2d0
parent 19816766029e8f73893d1d7ef788d76a954a3f9d
parent f60133f5d10b3fc71f305ff0df5cd45f60eb848f

Merge "Remove PARENT_SUB_ID since it's no longer needed."

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 098e058..6865eb8 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -380,7 +380,6 @@
                 + SubscriptionManager.WFC_IMS_ROAMING_MODE + " INTEGER DEFAULT -1,"
                 + SubscriptionManager.WFC_IMS_ROAMING_ENABLED + " INTEGER DEFAULT -1,"
                 + SubscriptionManager.IS_OPPORTUNISTIC + " INTEGER DEFAULT 0,"
-                + SubscriptionManager.PARENT_SUB_ID + " INTEGER DEFAULT -1,"
                 + SubscriptionManager.GROUP_UUID + " TEXT"
                 + ");";
     }
@@ -1120,8 +1119,6 @@
                     // Try to update the siminfo table. It might not be there.
                     db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN "
                             + SubscriptionManager.IS_OPPORTUNISTIC + " INTEGER DEFAULT 0;");
-                    db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN "
-                            + SubscriptionManager.PARENT_SUB_ID + " INTEGER DEFAULT -1;");
                 } catch (SQLiteException e) {
                     if (DBG) {
                         log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " +