lineage-sdk: Remove useless logic on database upgrading

 * The upgradeVersion < newVersion part is never reachable because we
   increase upgradeVersion unconditionally. Make it back to stage by
   nuking it as no one has experience issues before.

Change-Id: Icac1e18c192292ad3147fd4af4c862e93ef34ba5

1 files changed, 1 insertions, 18 deletions

diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
index 9589b4d8..e1208b79 100644
--- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
+++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
@@ -206,13 +206,11 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
             db.beginTransaction();
             try {
                 loadSettings(db);
-
                 db.setTransactionSuccessful();
-
-                upgradeVersion = 2;
             } finally {
                 db.endTransaction();
             }
+            upgradeVersion = 2;
         }
 
         if (upgradeVersion < 3) {
@@ -365,21 +363,6 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
             upgradeVersion = 10;
         }
         // *** Remember to update DATABASE_VERSION above!
-
-        if (upgradeVersion < newVersion) {
-            Log.w(TAG, "Got stuck trying to upgrade db. Old version: " + oldVersion
-                    + ", version stuck at: " +  upgradeVersion + ", new version: "
-                            + newVersion + ". Must wipe the lineage settings provider.");
-
-            dropDbTable(db, LineageTableNames.TABLE_SYSTEM);
-            dropDbTable(db, LineageTableNames.TABLE_SECURE);
-
-            if (mUserHandle == UserHandle.USER_OWNER) {
-                dropDbTable(db, LineageTableNames.TABLE_GLOBAL);
-            }
-
-            onCreate(db);
-        }
     }
 
     private void moveSettingsToNewTable(SQLiteDatabase db,