CallLogDatabase: Try to re-run the version 6 upgrade pathstaging/lineage-17.0_merge-android-10.0.0_r9

In Lineage 16.0, we changed the version of the database to 6. Because of that, anyone who
upgraded from 16.0 to 17.0 missed this upgrade path.
The missing column causes crashes in some apps.

Change-Id: I422b1d7465ea3becde77e43424fafbc6eaedce54

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);
             }