summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2015-03-24 09:11:16 +0100
committerDanny Baumann <dannybaumann@web.de>2015-03-24 09:11:16 +0100
commitbc79696d0f0fd1d9261a0484d78218d6d8738f06 (patch)
tree1bd2c30b8b9e1d7303bddd00ca97f6139f9205e4
parentadc1fe36fa0266baba292a0a99b3ab82bdb6cd72 (diff)
downloadandroid_packages_providers_TelephonyProvider-bc79696d0f0fd1d9261a0484d78218d6d8738f06.tar.gz
android_packages_providers_TelephonyProvider-bc79696d0f0fd1d9261a0484d78218d6d8738f06.tar.bz2
android_packages_providers_TelephonyProvider-bc79696d0f0fd1d9261a0484d78218d6d8738f06.zip
Properly upgrade DB
Change-Id: I19509480797f4b530ce6dd57942f37227b469453
-rw-r--r--src/com/android/providers/telephony/TelephonyProvider.java15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 11b0928..ad91785 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -63,7 +63,7 @@ public class TelephonyProvider extends ContentProvider
private static final boolean DBG = true;
private static final boolean VDBG = false;
- private static final int DATABASE_VERSION = 13 << 16;
+ private static final int DATABASE_VERSION = 17 << 16;
private static final int URL_UNKNOWN = 0;
private static final int URL_TELEPHONY = 1;
private static final int URL_CURRENT = 2;
@@ -426,6 +426,19 @@ public class TelephonyProvider extends ContentProvider
}
oldVersion = 13 << 16 | 6;
}
+ if (oldVersion < (17 << 16 | 6)) {
+ try {
+ // Try to update the siminfo table. It might not be there.
+ db.execSQL("ALTER TABLE " + SIMINFO_TABLE +
+ " ADD COLUMN " + SubscriptionManager.CARRIER_NAME + " TEXT DEFAULT '';");
+ } catch (SQLiteException e) {
+ if (DBG) {
+ log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " +
+ " The table will get created in onOpen.");
+ }
+ }
+ oldVersion = 17 << 16 | 6;
+ }
if (DBG) {
log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);
}