Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44a9993e authored by Lee Shombert's avatar Lee Shombert Committed by Android (Google) Code Review
Browse files

Merge "Correct handling of journal mode changes"

parents d5a01b4c 0431ae76

core/java/android/database/sqlite/SQLiteConnection.java

+4 −4
Original line number Diff line number Diff line
@@ -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();

        }