commit 994af69840f01f97060f4e94c57fd9c9ae8cbd25
author Steve Kondik <steve@cyngn.com> Thu Nov 03 01:44:08 2016 -0700
committer Jackeagle <jackeagle102@gmail.com> Wed Mar 01 23:48:54 2017 -0500
tree 9e4fd45d716a883005e0a46a9c78931ee57a1778
parent da36fcbf974d896db62107bc1b0dc9b8095ac41d

telephony: Fix initial database creation

Change-Id: I84619348ebe1ec0259a9d8eddf5a41f8c883582e

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 16e7110..3512d44 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -265,6 +265,7 @@
                     + SubscriptionManager.DATA_ROAMING + " INTEGER DEFAULT " + SubscriptionManager.DATA_ROAMING_DEFAULT + ","
                     + SubscriptionManager.MCC + " INTEGER DEFAULT 0,"
                     + SubscriptionManager.MNC + " INTEGER DEFAULT 0,"
+                    + SubscriptionManager.USER_NETWORK_MODE + " INTEGER DEFAULT " + RILConstants.PREFERRED_NETWORK_MODE + ","
                     + SubscriptionManager.CB_EXTREME_THREAT_ALERT + " INTEGER DEFAULT 1,"
                     + SubscriptionManager.CB_SEVERE_THREAT_ALERT + " INTEGER DEFAULT 1,"
                     + SubscriptionManager.CB_AMBER_ALERT + " INTEGER DEFAULT 1,"
@@ -576,7 +577,8 @@
                 upgradeForSubscriptionInfoIfNecessary(db);
                 oldVersion = 13 << 16 | 6;
             }
-            if (oldVersion < (16 << 16 | 6)) {
+            if (oldVersion < (14 << 16 | 6) || oldVersion < (15 << 16 | 6) ||
+                    oldVersion < (16 << 16 | 6)) {
                 // Handle migration from current AOSP (by artificially bumping the version
                 // and handle migration from cm-11.0, by checking for an existing column
                 // and then forcing the introduction of new columns