commit b659e1be774ea2509add117df59719bd337922f7
author Xiangyu/Malcolm Chen <refuhoo@google.com> Tue Nov 27 00:24:00 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 27 00:24:00 2018 +0000
tree 5ac872dd202610bd379403664462e9a78e1c6c9b
parent fc10d0a4e42aaec807ea8284d5006b3c245ecc97
parent c7eb4eacc3080aa4348ff4a3cdbf7831649337f0

Merge changes from topic "Group ID"

* changes:
  Remove the "alter table drop column" to prevent upgrade failure.
  Update TelephonyProvider to add group ID.

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 58e8b4a..93308fe 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 = 29 << 16;
+    private static final int DATABASE_VERSION = 30 << 16;
     private static final int URL_UNKNOWN = 0;
     private static final int URL_TELEPHONY = 1;
     private static final int URL_CURRENT = 2;
@@ -380,7 +380,8 @@
                 + 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.PARENT_SUB_ID + " INTEGER DEFAULT -1,"
+                + SubscriptionManager.GROUP_UUID + " TEXT"
                 + ");";
     }
 
@@ -1144,6 +1145,20 @@
                 }
                 oldVersion = 29 << 16 | 6;
             }
+
+            if (oldVersion < (30 << 16 | 6)) {
+                try {
+                    // Try to update the siminfo table. It might not be there.
+                    db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN "
+                            + SubscriptionManager.GROUP_UUID + " TEXT;");
+                } catch (SQLiteException e) {
+                    if (DBG) {
+                        log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " +
+                                "The table will get created in onOpen.");
+                    }
+                }
+                oldVersion = 30 << 16 | 6;
+            }
             if (DBG) {
                 log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);
             }