diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2014-11-06 11:50:40 -0800 |
|---|---|---|
| committer | Natiq Ahmed <mnatiq@codeaurora.org> | 2015-03-11 00:03:33 +0530 |
| commit | 7ffdf6ddff108889c16f903a8a6de6de6015692c (patch) | |
| tree | 97ee9b115261385e52215dbbc6b9d63fe5e2814d /src/com/android/providers/telephony/TelephonyProvider.java | |
| parent | 6ede22f6dd2ff8d9f7eb17b7e67c6af49380b6d0 (diff) | |
| download | android_packages_providers_TelephonyProvider-7ffdf6ddff108889c16f903a8a6de6de6015692c.tar.gz android_packages_providers_TelephonyProvider-7ffdf6ddff108889c16f903a8a6de6de6015692c.tar.bz2 android_packages_providers_TelephonyProvider-7ffdf6ddff108889c16f903a8a6de6de6015692c.zip | |
API changes to add carrier name to subinforecord
API changes required to add carrier name of sim as a member of subinforecord.
Bug: 17732079
Bug: 18247211
Change-Id: I718700648ddd5a2646c720591ce776bd30a03543
Diffstat (limited to 'src/com/android/providers/telephony/TelephonyProvider.java')
| -rw-r--r-- | src/com/android/providers/telephony/TelephonyProvider.java | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java index 264768a..2a7e867 100644 --- a/src/com/android/providers/telephony/TelephonyProvider.java +++ b/src/com/android/providers/telephony/TelephonyProvider.java @@ -61,7 +61,7 @@ public class TelephonyProvider extends ContentProvider private static final boolean DBG = true; private static final boolean VDBG = false; - private static final int DATABASE_VERSION = 12 << 16; + private static final int DATABASE_VERSION = 13 << 16; private static final int URL_UNKNOWN = 0; private static final int URL_TELEPHONY = 1; private static final int URL_CURRENT = 2; @@ -196,6 +196,7 @@ public class TelephonyProvider extends ContentProvider + SubscriptionManager.ICC_ID + " TEXT NOT NULL," + SubscriptionManager.SIM_ID + " INTEGER DEFAULT " + SubscriptionManager.SIM_NOT_INSERTED + "," + SubscriptionManager.DISPLAY_NAME + " TEXT," + + SubscriptionManager.CARRIER_NAME + " TEXT," + SubscriptionManager.NAME_SOURCE + " INTEGER DEFAULT " + SubscriptionManager.NAME_SOURCE_DEFAULT_SOURCE + "," + SubscriptionManager.COLOR + " INTEGER DEFAULT " + SubscriptionManager.COLOR_DEFAULT + "," + SubscriptionManager.NUMBER + " TEXT," @@ -387,6 +388,19 @@ public class TelephonyProvider extends ContentProvider } oldVersion = 12 << 16 | 6; } + if (oldVersion < (13 << 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 = 13 << 16 | 6; + } if (DBG) { log("dbh.onUpgrade:- db=" + db + " oldV=" + oldVersion + " newV=" + newVersion); } |