diff options
| author | Tom Taylor <tomtaylor@google.com> | 2014-09-10 11:01:44 -0700 |
|---|---|---|
| committer | Tom Taylor <tomtaylor@google.com> | 2014-09-10 11:01:44 -0700 |
| commit | c55054d7dfde5e5b1cbc137cf37597c444ad48ad (patch) | |
| tree | 0c29f97232265302f11d630ba2d2171cab71d6c9 /src/com/android/providers/telephony/TelephonyProvider.java | |
| parent | 6e3c0dc4e12bf48543af8df85f3452985e0043ed (diff) | |
| download | android_packages_providers_TelephonyProvider-c55054d7dfde5e5b1cbc137cf37597c444ad48ad.tar.gz android_packages_providers_TelephonyProvider-c55054d7dfde5e5b1cbc137cf37597c444ad48ad.tar.bz2 android_packages_providers_TelephonyProvider-c55054d7dfde5e5b1cbc137cf37597c444ad48ad.zip | |
Unable to make calls on LRW71C
Bug 17450595
The code was trying to update a table that wasn't there. The table is
lazily created in onOpen.
Change-Id: I364cf16370a57fb702dd8175d54a8cfffb392426
Diffstat (limited to 'src/com/android/providers/telephony/TelephonyProvider.java')
| -rw-r--r-- | src/com/android/providers/telephony/TelephonyProvider.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java index 24c6596..85bf741 100644 --- a/src/com/android/providers/telephony/TelephonyProvider.java +++ b/src/com/android/providers/telephony/TelephonyProvider.java @@ -360,10 +360,18 @@ public class TelephonyProvider extends ContentProvider oldVersion = 11 << 16 | 6; } if (oldVersion < (12 << 16 | 6)) { - db.execSQL("ALTER TABLE " + SIMINFO_TABLE + - " ADD COLUMN " + SubscriptionManager.MCC + " INTEGER DEFAULT 0;"); - db.execSQL("ALTER TABLE " + SIMINFO_TABLE + - " ADD COLUMN " + SubscriptionManager.MNC + " INTEGER DEFAULT 0;"); + try { + // Try to update the siminfo table. It might not be there. + db.execSQL("ALTER TABLE " + SIMINFO_TABLE + + " ADD COLUMN " + SubscriptionManager.MCC + " INTEGER DEFAULT 0;"); + db.execSQL("ALTER TABLE " + SIMINFO_TABLE + + " ADD COLUMN " + SubscriptionManager.MNC + " INTEGER DEFAULT 0;"); + } catch (SQLiteException e) { + if (DBG) { + log("onUpgrade skipping " + SIMINFO_TABLE + " upgrade. " + + " The table will get created in onOpen."); + } + } oldVersion = 12 << 16 | 6; } if (DBG) { |