Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct handling of journal mode changes"

Browse Source
This commit is contained in:
Lee Shombert
2023-06-16 16:38:30 +00:00
committed by Android (Google) Code Review
parent d5a01b4ce2 0431ae7689
commit 44a9993e06
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/database/sqlite/SQLiteConnection.java
View File

@@ -580,6 +580,10 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
final int oldSize = mConfiguration.perConnectionSql.size();
final int newSize = configuration.perConnectionSql.size();
boolean perConnectionSqlChanged = newSize > oldSize;
boolean journalModeChanged = !configuration.resolveJournalMode().equalsIgnoreCase(
mConfiguration.resolveJournalMode());
boolean syncModeChanged =
!configuration.resolveSyncMode().equalsIgnoreCase(mConfiguration.resolveSyncMode());
// Update configuration parameters.
mConfiguration.updateParametersFrom(configuration);
@@ -591,14 +595,10 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
setForeignKeyModeFromConfiguration();
}
boolean journalModeChanged = !configuration.resolveJournalMode().equalsIgnoreCase(
mConfiguration.resolveJournalMode());
if (journalModeChanged) {
setJournalFromConfiguration();
}
boolean syncModeChanged =
!configuration.resolveSyncMode().equalsIgnoreCase(mConfiguration.resolveSyncMode());
if (syncModeChanged) {
setSyncModeFromConfiguration();
}