diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-11-03 01:44:08 -0700 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2016-12-30 22:25:43 +0200 |
| commit | f4f533a9bf3fd0839510ee1d76c5ee01059370f4 (patch) | |
| tree | ef6a77dd072276f98a8da1f1e8543939355057e5 | |
| parent | 8718d9bc91d15d6191830d770710fca2c5f751aa (diff) | |
| download | android_packages_providers_TelephonyProvider-f4f533a9bf3fd0839510ee1d76c5ee01059370f4.tar.gz android_packages_providers_TelephonyProvider-f4f533a9bf3fd0839510ee1d76c5ee01059370f4.tar.bz2 android_packages_providers_TelephonyProvider-f4f533a9bf3fd0839510ee1d76c5ee01059370f4.zip | |
telephony: Fix initial database creation
Change-Id: I84619348ebe1ec0259a9d8eddf5a41f8c883582e
| -rw-r--r-- | src/com/android/providers/telephony/TelephonyProvider.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java index d32b34b..a0664a0 100644 --- a/src/com/android/providers/telephony/TelephonyProvider.java +++ b/src/com/android/providers/telephony/TelephonyProvider.java @@ -265,6 +265,7 @@ public class TelephonyProvider extends ContentProvider + 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 @@ public class TelephonyProvider extends ContentProvider 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 |