commit 0a0e4826aa063aa41e00d58138271e98c569441d
author Xin Li <delphij@google.com> Fri May 17 00:58:08 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 17 00:58:08 2019 +0000
tree 1c2a10728c20672a9730e6329a5b0c8f70d9da90
parent bc12c48d634686276a3ee72a44951d1198d57935
parent 76cfc967079ea75dcb579eb96d8999720e79d973

Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master."

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 18c04d2..dbb85fb 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -145,7 +145,7 @@
     private static final boolean DBG = true;
     private static final boolean VDBG = false; // STOPSHIP if true
 
-    private static final int DATABASE_VERSION = 38 << 16;
+    private static final int DATABASE_VERSION = 39 << 16;
     private static final int URL_UNKNOWN = 0;
     private static final int URL_TELEPHONY = 1;
     private static final int URL_CURRENT = 2;
@@ -397,7 +397,8 @@
                 + SubscriptionManager.PROFILE_CLASS_DEFAULT + ","
                 + SubscriptionManager.SUBSCRIPTION_TYPE + " INTEGER DEFAULT "
                 + SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM + ","
-                + SubscriptionManager.WHITE_LISTED_APN_DATA + " INTEGER DEFAULT 0"
+                + SubscriptionManager.WHITE_LISTED_APN_DATA + " INTEGER DEFAULT 0,"
+                + SubscriptionManager.GROUP_OWNER + " TEXT"
                 + ");";
     }
 
@@ -1302,6 +1303,20 @@
                 oldVersion = 38 << 16 | 6;
             }
 
+            if (oldVersion < (39 << 16 | 6)) {
+                try {
+                    // Try to update the siminfo table. It might not be there.
+                    db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN "
+                            + SubscriptionManager.GROUP_OWNER + " TEXT;");
+                } catch (SQLiteException e) {
+                    if (DBG) {
+                        log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " +
+                                "The table will get created in onOpen.");
+                    }
+                }
+                oldVersion = 39 << 16 | 6;
+            }
+
             if (DBG) {
                 log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);
             }