summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/providers/contacts/CallLogDatabaseHelper.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/providers/contacts/CallLogDatabaseHelper.java b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
index bfec2237..c3ecebce 100644
--- a/src/com/android/providers/contacts/CallLogDatabaseHelper.java
+++ b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
@@ -221,6 +221,15 @@ public class CallLogDatabaseHelper {
}
if (oldVersion < 7) {
+ try {
+ upgradeToVersion6(db);
+ } catch (SQLiteException e) {
+ // For the case of upgrading from 16.0, the column already exists. Ignore duplicate column exceptions
+ if (!e.getMessage().contains("duplicate")) {
+ throw e;
+ }
+ }
+
upgradeToVersion7(db);
}