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

Commit 8c469b90 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android (Google) Code Review
Browse files

Merge "Update wal mode of the connection when disabling WAL"

parents a891ca5f fd22a196

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -12308,6 +12308,7 @@ package android.database.sqlite { 
    method public static int getWALAutoCheckpoint();

    method public static int getWALConnectionPoolSize();

    method public static java.lang.String getWALSyncMode();

    method public static boolean isCompatibilityWalSupported();

    method public static int releaseMemory();

  }

























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



+2
−1




























Original line number
Diff line number
Diff line








@@ -416,7 +416,8 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen













        boolean foreignKeyModeChanged = configuration.foreignKeyConstraintsEnabled















                != mConfiguration.foreignKeyConstraintsEnabled;















        boolean walModeChanged = ((configuration.openFlags ^ mConfiguration.openFlags)













                & SQLiteDatabase.ENABLE_WRITE_AHEAD_LOGGING) != 0;













                & SQLiteDatabase.ENABLE_WRITE_AHEAD_LOGGING) != 0













                || configuration.useCompatibilityWal != mConfiguration.useCompatibilityWal;















        boolean localeChanged = !configuration.locale.equals(mConfiguration.locale);































        // Update configuration parameters.

































core/java/android/database/sqlite/SQLiteGlobal.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -83,7 +83,6 @@ public final class SQLiteGlobal {













    /**















     * Returns true if compatibility WAL mode is supported. In this mode, only















     * database journal mode is changed. Connection pool will use at most one connection.













     * @hide















     */















    public static boolean isCompatibilityWalSupported() {















        return SystemProperties.getBoolean("debug.sqlite.compatibility_wal_supported",