summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Pasanen <dan.pasanen@gmail.com>2017-02-14 18:20:47 -0600
committerDan Pasanen <dan.pasanen@gmail.com>2017-02-14 18:20:49 -0600
commitc881ebad1977881414e6b92fc9acca6c2d196b86 (patch)
tree61a9c5fc380bda4027d0975929d3fa2e229b6d17
parent54846fcc978393f216d49b87cb44dab48a882a9a (diff)
downloadandroid_packages_providers_ContactsProvider-staging/cm-14.1-cafrebase.tar.gz
android_packages_providers_ContactsProvider-staging/cm-14.1-cafrebase.tar.bz2
android_packages_providers_ContactsProvider-staging/cm-14.1-cafrebase.zip
dbhelper: fix schema disaster from pre-cafrebase repostaging/cm-14.1-cafrebase
* Databases created before the cafrebase had schema of version 4, but the version in the database was never updated to 4. Fix the case of the database self-identifying as 3, yet having all the properties of 4. Change-Id: I26fa7f249565a0b48b462a4ec188111907c4b42c
-rwxr-xr-xsrc/com/android/providers/contacts/CallLogDatabaseHelper.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/providers/contacts/CallLogDatabaseHelper.java b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
index 6bc7d40b..3b0f6230 100755
--- a/src/com/android/providers/contacts/CallLogDatabaseHelper.java
+++ b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
@@ -234,11 +234,14 @@ public class CallLogDatabaseHelper {
private void upgradeToVersion3(SQLiteDatabase db) {
db.execSQL("ALTER TABLE " + Tables.VOICEMAIL_STATUS + " ADD " + Status.SOURCE_TYPE +
" TEXT;");
+ db.execSQL("ALTER TABLE " + Tables.CALLS + " ADD " + CALLS_OPERATOR
+ + " TEXT;");
}
private void upgradeToVersion4(SQLiteDatabase db) {
- db.execSQL("ALTER TABLE " + Tables.CALLS + " ADD " + CALLS_OPERATOR
- + " TEXT;");
+ // Intentionally empty. Lineage (pre cafrebase) had the version 4 schema, but
+ // never updated the database's user_version, so technically database version 3
+ // included what used to be here. Shit hax.
}
/**