commit 1614217de5c5b750c6c97d7980a4ba590ca5f783
author fionaxu <fionaxu@google.com> Wed Apr 20 00:27:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 20 00:27:19 2016 +0000
tree 0e67f2e3912894f62944281f913758aad62c9085
parent 6f820c1197900afd524589d0a9cd5f7b31193452
parent 77f5e56875185844011685ae1bb59467ca771ff9

Merge "Cold sim issue fix in telephony Provider" into nyc-dev
am: 77f5e56875

* commit '77f5e56875185844011685ae1bb59467ca771ff9':
  Cold sim issue fix in telephony Provider

Change-Id: Ib5da6ef7cd46e2105c89554676dd06f1600e0ece

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 23e75f2..97e9b69 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -68,7 +68,7 @@
     private static final boolean DBG = true;
     private static final boolean VDBG = false; // STOPSHIP if true
 
-    private static final int DATABASE_VERSION = 17 << 16;
+    private static final int DATABASE_VERSION = 18 << 16;
     private static final int URL_UNKNOWN = 0;
     private static final int URL_TELEPHONY = 1;
     private static final int URL_CURRENT = 2;
@@ -261,6 +261,7 @@
                     + SubscriptionManager.DATA_ROAMING + " INTEGER DEFAULT " + SubscriptionManager.DATA_ROAMING_DEFAULT + ","
                     + SubscriptionManager.MCC + " INTEGER DEFAULT 0,"
                     + SubscriptionManager.MNC + " INTEGER DEFAULT 0,"
+                    + SubscriptionManager.SIM_PROVISIONING_STATUS + " INTEGER DEFAULT " + SubscriptionManager.SIM_PROVISIONED + ","
                     + SubscriptionManager.CB_EXTREME_THREAT_ALERT + " INTEGER DEFAULT 1,"
                     + SubscriptionManager.CB_SEVERE_THREAT_ALERT + " INTEGER DEFAULT 1,"
                     + SubscriptionManager.CB_AMBER_ALERT + " INTEGER DEFAULT 1,"
@@ -711,6 +712,20 @@
                 }
                 oldVersion = 17 << 16 | 6;
             }
+            if (oldVersion < (18 << 16 | 6)) {
+                try {
+                    // Try to update the siminfo table. It might not be there.
+                    db.execSQL("ALTER TABLE " + SIMINFO_TABLE + " ADD COLUMN " +
+                            SubscriptionManager.SIM_PROVISIONING_STATUS + " INTEGER DEFAULT " +
+                            SubscriptionManager.SIM_PROVISIONED + ";");
+                } catch (SQLiteException e) {
+                    if (DBG) {
+                        log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " +
+                                " The table will get created in onOpen.");
+                    }
+                }
+                oldVersion = 18 << 16 | 6;
+            }
             if (DBG) {
                 log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);
             }