diff options
| author | Danny Baumann <dannybaumann@web.de> | 2015-03-31 09:01:56 +0200 |
|---|---|---|
| committer | Danny Baumann <dannybaumann@web.de> | 2015-04-07 13:47:12 +0200 |
| commit | 553933c7399ef8a06cf9035b1781926bcf566cf5 (patch) | |
| tree | 08154e22bcb3680a6b6bc9259ec27e1a8f0e85fe /src/com/android/providers/telephony/TelephonyProvider.java | |
| parent | 0fae3aec011303b17530eb754cf6f428ac714ea4 (diff) | |
| download | android_packages_providers_TelephonyProvider-553933c7399ef8a06cf9035b1781926bcf566cf5.tar.gz android_packages_providers_TelephonyProvider-553933c7399ef8a06cf9035b1781926bcf566cf5.tar.bz2 android_packages_providers_TelephonyProvider-553933c7399ef8a06cf9035b1781926bcf566cf5.zip | |
Add proper DB upgrade path.
Add back the CM11 upgrade path and a phone_id -> sub_id conversion.
Change-Id: I1f26dca48ac1536a524177ff20e59d7242100861
Diffstat (limited to 'src/com/android/providers/telephony/TelephonyProvider.java')
| -rw-r--r-- | src/com/android/providers/telephony/TelephonyProvider.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java index fa498a9..bc5baf9 100644 --- a/src/com/android/providers/telephony/TelephonyProvider.java +++ b/src/com/android/providers/telephony/TelephonyProvider.java @@ -437,9 +437,15 @@ public class TelephonyProvider extends ContentProvider " The table will get created in onOpen."); } } - // Update carriers table to add read_only column - db.execSQL("ALTER TABLE " + CARRIERS_TABLE + - " ADD COLUMN read_only BOOLEAN DEFAULT 0;"); + try { + // read_only was present in CM11, but not in CM12. Add it if it's missing. + db.execSQL("ALTER TABLE " + CARRIERS_TABLE + + " ADD COLUMN read_only BOOLEAN DEFAULT 0;"); + } catch (SQLiteException e) { + if (DBG) { + log("onUpgrade " + CARRIERS_TABLE + ": read_only already present."); + } + } oldVersion = 17 << 16 | 6; } if (DBG) { |