Android/lineage-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lineage-sdk: Remove useless logic on database upgrading

Browse Source 
* 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
This commit is contained in:
Han Wang
2018-12-23 18:45:43 +01:00
committed by Michael Bestas
parent a7d4dff902
commit 68a1d795d3
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
View File

@@ -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,